diff options
| author | Dan Gudmundsson <[email protected]> | 2013-01-15 09:18:49 +0100 | 
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-01-15 09:18:49 +0100 | 
| commit | 0e044f3525d22de4c4c471f601de50ad3acda304 (patch) | |
| tree | dfbbcc31814b0890fcb7774a48cf43322b29ac94 /lib/runtime_tools/src/runtime_tools.app.src | |
| parent | fdd0b38e2c85d897a240e5f8f79e268c6540dbfd (diff) | |
| parent | c384a91846f7d0aff189fb51d1d502330d7abef4 (diff) | |
| download | otp-0e044f3525d22de4c4c471f601de50ad3acda304.tar.gz otp-0e044f3525d22de4c4c471f601de50ad3acda304.tar.bz2 otp-0e044f3525d22de4c4c471f601de50ad3acda304.zip | |
Merge branch 'dgud/wx/fix-wx-2.9-compat/OTP-10407'
* dgud/wx/fix-wx-2.9-compat/OTP-10407: (26 commits)
  wx: Fix comments
  wx: Workaround wx-2.9 bugs
  wx: Mac fixes
  wx: Fix demo and tests
  wx: Allow 64 bits compilation on mac, requires wxWidgets-2.9
  appmon: Move runtime part to runtime_tools app
  reltool: fix wxWidgets-2.9 compability
  debugger: Fix 2.9 compat
  observer: Fix check for graphics contexts
  Observer: Fix distribution dialog
  observer: Fix font sizes
  wx: Fix the demo
  wx: Fix loading icons and cursors in Windows
  wx: Remove unnecessary casts
  wx: Fix changed getfunctions
  wx: Depricate wxCursor new functions
  wx: Fix int to enum
  wx: Include correct m4 file in 2.9
  wx: Update examples so they work with both wxWidgets 2.8 and 2.9
  wx: Modify tests so they work on wxWidgets-2.9
  ...
Diffstat (limited to 'lib/runtime_tools/src/runtime_tools.app.src')
| -rw-r--r-- | lib/runtime_tools/src/runtime_tools.app.src | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/lib/runtime_tools/src/runtime_tools.app.src b/lib/runtime_tools/src/runtime_tools.app.src index 60be9ed7c9..602048dc21 100644 --- a/lib/runtime_tools/src/runtime_tools.app.src +++ b/lib/runtime_tools/src/runtime_tools.app.src @@ -19,7 +19,7 @@  {application, runtime_tools,     [{description,  "RUNTIME_TOOLS"},      {vsn,          "%VSN%"}, -    {modules,      [dbg,observer_backend,percept_profile, +    {modules,      [appmon_info, dbg,observer_backend,percept_profile,  		    runtime_tools,runtime_tools_sup,erts_alloc_config,  		    ttb_autostart,dyntrace]},      {registered,   [runtime_tools_sup]}, | 
