diff options
| author | krzys-h <krzys_h@interia.pl> | 2014-07-11 15:24:44 +0200 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2014-07-11 15:24:44 +0200 |
| commit | 96d49d84aafecd78c902681f20de6207badf7e85 (patch) | |
| tree | 7a835fce4f264c6c0886441c4f79e02cdf47582c /src/common/event.h | |
| parent | 5223ef1fb116780298495a4d2f63e6c2c39fdfbd (diff) | |
| parent | 852223262055440569ecca70f1b9da46089424c4 (diff) | |
| download | colobot-96d49d84aafecd78c902681f20de6207badf7e85.tar.gz colobot-96d49d84aafecd78c902681f20de6207badf7e85.tar.bz2 colobot-96d49d84aafecd78c902681f20de6207badf7e85.zip | |
Merge branch 'dev' into dev-physfs
Conflicts:
data
src/app/gamedata.cpp
src/ui/control.cpp
src/ui/edit.cpp
src/ui/maindialog.cpp
Diffstat (limited to 'src/common/event.h')
| -rw-r--r-- | src/common/event.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/common/event.h b/src/common/event.h index c5eb615..220b807 100644 --- a/src/common/event.h +++ b/src/common/event.h @@ -90,7 +90,6 @@ enum EventType EVENT_BUTTON_CANCEL = 41, EVENT_BUTTON_NEXT = 42, EVENT_BUTTON_PREV = 43, - EVENT_BUTTON_QUIT = 44, EVENT_BUTTON0 = 50, EVENT_BUTTON1 = 51, @@ -193,7 +192,6 @@ enum EventType EVENT_INTERFACE_READ = 411, EVENT_INTERFACE_ABORT = 412, EVENT_INTERFACE_USER = 413, - EVENT_INTERFACE_TEEN = 414, EVENT_INTERFACE_CHAP = 420, EVENT_INTERFACE_LIST = 421, |