summary refs log tree commit diff stats
path: root/tools/mapedit/src
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2018-02-12 16:53:30 -0500
committerKelly Rauchenberger <fefferburbia@gmail.com>2018-02-12 16:53:30 -0500
commit3df19e45e737a1b9395a9a258e3263e444ebedd7 (patch)
tree896adccf14054cf54291c1d5bc7825a8888a351b /tools/mapedit/src
parent5cc80ec58ea5bd66456f6f5286fa5f26d3fe702b (diff)
parentbc63fa57ced1c7329f7fdcfd168eaf7e290158bc (diff)
downloadtherapy-3df19e45e737a1b9395a9a258e3263e444ebedd7.tar.gz
therapy-3df19e45e737a1b9395a9a258e3263e444ebedd7.tar.bz2
therapy-3df19e45e737a1b9395a9a258e3263e444ebedd7.zip
Merge branch 'master' into es-rewrite
Diffstat (limited to 'tools/mapedit/src')
-rw-r--r--tools/mapedit/src/frame.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/mapedit/src/frame.cpp b/tools/mapedit/src/frame.cpp index aad3294..7112102 100644 --- a/tools/mapedit/src/frame.cpp +++ b/tools/mapedit/src/frame.cpp
@@ -15,6 +15,7 @@
15static std::list<wxWindow*> openWindows; 15static std::list<wxWindow*> openWindows;
16 16
17enum { 17enum {
18 IGNORE,
18 MENU_VIEW_ZOOM_IN, 19 MENU_VIEW_ZOOM_IN,
19 MENU_VIEW_ZOOM_OUT, 20 MENU_VIEW_ZOOM_OUT,
20 MENU_FILE_NEW, 21 MENU_FILE_NEW,