diff options
| author | Magnus Lidén <[email protected]> | 2013-09-17 10:22:16 +0200 |
|---|---|---|
| committer | Magnus Lidén <[email protected]> | 2013-09-17 10:22:16 +0200 |
| commit | 5f89a574cb57f94c9d7d45370b5002b1d38147c9 (patch) | |
| tree | faa4a449754c8348a8ef06938f8ffe1246ed0b16 /lib/wx | |
| parent | 36d4d6fbe37ba9b03a157cdd0e66f3ac28921e0e (diff) | |
| parent | 20641fe0f2ea745873fc7557448d3a7deb1bd639 (diff) | |
| download | otp-5f89a574cb57f94c9d7d45370b5002b1d38147c9.tar.gz otp-5f89a574cb57f94c9d7d45370b5002b1d38147c9.tar.bz2 otp-5f89a574cb57f94c9d7d45370b5002b1d38147c9.zip | |
Merge tag 'OTP_R16B02'
The R16B02 release
Conflicts:
lib/sasl/vsn.mk
Diffstat (limited to 'lib/wx')
| -rw-r--r-- | lib/wx/vsn.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk index 1c406ccec6..869ed99f16 100644 --- a/lib/wx/vsn.mk +++ b/lib/wx/vsn.mk @@ -1 +1 @@ -WX_VSN = 1.0 +WX_VSN = 1.1 |