diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-03-30 15:01:00 +0100 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-03-30 15:23:05 +0100 |
| commit | e218dcfdf2c58f8841e7ebd220527d08e870a6d5 (patch) | |
| tree | a567db04a8a51e2db87f80e259faf222a7d4becd /src/ui/target.h | |
| parent | bfc701e286259d9a7aa2ff8240704eab2ba3a237 (diff) | |
| parent | e607fed265070be8c518d4302d8b76f738421fb3 (diff) | |
| download | colobot-e218dcfdf2c58f8841e7ebd220527d08e870a6d5.tar.gz colobot-e218dcfdf2c58f8841e7ebd220527d08e870a6d5.tar.bz2 colobot-e218dcfdf2c58f8841e7ebd220527d08e870a6d5.zip | |
Merge branch 'dev'
Merging content from dev
Diffstat (limited to 'src/ui/target.h')
| -rw-r--r-- | src/ui/target.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/ui/target.h b/src/ui/target.h index 05a3651..054524b 100644 --- a/src/ui/target.h +++ b/src/ui/target.h @@ -18,20 +18,19 @@ #pragma once -#include <string> - -#include "ui/control.h" - +#include "common/event.h" #include "common/misc.h" -#include "common/iman.h" #include "common/restext.h" -#include "common/event.h" #include "graphics/engine/engine.h" #include "object/robotmain.h" #include "object/object.h" +#include "ui/control.h" + +#include <string> + namespace Ui { |