aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorErlang/OTP <otp@erlang.org>2010-02-12 09:51:39 +0000
committerErlang/OTP <otp@erlang.org>2010-02-12 09:51:39 +0000
commit9e009689743b32168ec0b5be8cb113d5867fec3f (patch)
tree0b3bee07f5b10991e176cd31e152a3de87e2b660 /lib
parentb14ca0fae3dcb3add0f5da7b194fdfc2b0e5f7f8 (diff)
parentc3faaf4eaa9b37a15a63f5e8f431364b7ffffa89 (diff)
downloadotp-9e009689743b32168ec0b5be8cb113d5867fec3f.tar.gz
otp-9e009689743b32168ec0b5be8cb113d5867fec3f.tar.bz2
otp-9e009689743b32168ec0b5be8cb113d5867fec3f.zip
Merge branch 'mp/et-app-file' into ccase/r13b04_dev
* mp/et-app-file: unbreak event tracer's app.src
Diffstat (limited to 'lib')
-rw-r--r--lib/et/src/et.app.src2
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/et/src/et.app.src b/lib/et/src/et.app.src
index dc22ce4223..fd203e3e44 100644
--- a/lib/et/src/et.app.src
+++ b/lib/et/src/et.app.src
@@ -24,12 +24,10 @@
[
et,
et_collector,
- et_contents_viewer,
et_gs_contents_viewer,
et_gs_viewer,
et_selector,
et_viewer,
- et_viewer,
et_wx_contents_viewer,
et_wx_viewer
]},