diff options
| author | Rickard Green <[email protected]> | 2014-03-20 17:10:32 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-03-20 17:10:32 +0100 |
| commit | 3c06b5b3cdde72453d97910889e38e91c1dd4870 (patch) | |
| tree | 1e58ec80f38cdea611b1ce297a1826ee869de605 /lib/wx | |
| parent | a50d7e892e3b2b3c8241eabd6bd0121672a6720f (diff) | |
| parent | e0052804daa336e0d05b8a451e15b07afd085074 (diff) | |
| download | otp-3c06b5b3cdde72453d97910889e38e91c1dd4870.tar.gz otp-3c06b5b3cdde72453d97910889e38e91c1dd4870.tar.bz2 otp-3c06b5b3cdde72453d97910889e38e91c1dd4870.zip | |
Merge branch 'rickard/runtime-dep/OTP-11773'
* rickard/runtime-dep/OTP-11773:
Introduce system_information:sanity_check()
Verify runtime_dependencies when running 'otp_build patch_app'
Add test-case verifying runtime dependencies found by xref
Introduce runtime_dependencies in .app files
Bump versions and ensure that all are "normal" versions
Diffstat (limited to 'lib/wx')
| -rw-r--r-- | lib/wx/src/wx.app.src | 3 | ||||
| -rw-r--r-- | lib/wx/vsn.mk | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/wx/src/wx.app.src b/lib/wx/src/wx.app.src index e13982b0c1..d5ac478f20 100644 --- a/lib/wx/src/wx.app.src +++ b/lib/wx/src/wx.app.src @@ -33,5 +33,6 @@ ]}, {registered, []}, {applications, [stdlib, kernel]}, - {env, []} + {env, []}, + {runtime_dependencies, ["stdlib-2.0","kernel-3.0","erts-6.0"]} ]}. diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk index c018b4fb86..5523c20440 100644 --- a/lib/wx/vsn.mk +++ b/lib/wx/vsn.mk @@ -1 +1 @@ -WX_VSN = 1.1.2 +WX_VSN = 1.2 |