diff options
| author | Rickard Green <[email protected]> | 2016-08-12 14:38:36 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-08-12 14:38:36 +0200 |
| commit | b412ea7ed2513400bcaa63581ae68219e7cce2d6 (patch) | |
| tree | acbe8ad2f9a25e75faaaeff6e7317e186ad1bec7 /lib/wx/src/gen/wxSystemSettings.erl | |
| parent | 49722eb3e32b92563e576283d84531797c2a3627 (diff) | |
| parent | 7518684155aaabdde97c7b624803523c045bc185 (diff) | |
| download | otp-b412ea7ed2513400bcaa63581ae68219e7cce2d6.tar.gz otp-b412ea7ed2513400bcaa63581ae68219e7cce2d6.tar.bz2 otp-b412ea7ed2513400bcaa63581ae68219e7cce2d6.zip | |
Merge branch 'maint-18' into maint
* maint-18:
Updated OTP version
Prepare release
Conflicts:
OTP_VERSION
erts/doc/src/notes.xml
erts/vsn.mk
otp_versions.table
Diffstat (limited to 'lib/wx/src/gen/wxSystemSettings.erl')
0 files changed, 0 insertions, 0 deletions