diff options
| author | Michał Konopacki <konopacki.m@gmail.com> | 2012-08-20 15:12:26 +0200 |
|---|---|---|
| committer | Michał Konopacki <konopacki.m@gmail.com> | 2012-08-20 15:12:26 +0200 |
| commit | 7a4ec2adc4e40a6236ecd76ed5d6492d6ceac15a (patch) | |
| tree | e1df82b6fcf9ce34c01b1b06674516747578ef3e /src/ui/window.cpp | |
| parent | 8666d35f7c3129c101029eae1cd0a5124f35b7de (diff) | |
| parent | 8d4a3ed57915af2acf8b3dcd9a8aec5a75806ca6 (diff) | |
| download | colobot-7a4ec2adc4e40a6236ecd76ed5d6492d6ceac15a.tar.gz colobot-7a4ec2adc4e40a6236ecd76ed5d6492d6ceac15a.tar.bz2 colobot-7a4ec2adc4e40a6236ecd76ed5d6492d6ceac15a.zip | |
Merge remote-tracking branch 'erihel/dev-ui' into dev-ui
Conflicts:
src/ui/button.h
src/ui/color.h
src/ui/compass.h
src/ui/control.h
src/ui/displayinfo.h
src/ui/displaytext.h
src/ui/edit.h
src/ui/editvalue.h
src/ui/gauge.h
src/ui/group.h
src/ui/image.h
src/ui/slider.h
Diffstat (limited to 'src/ui/window.cpp')
0 files changed, 0 insertions, 0 deletions