diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-10-02 18:57:10 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-10-02 18:57:10 +0300 |
| commit | f1e92aca00a4859047e83fab76220767b9a2f814 (patch) | |
| tree | 8aaa9d6853c6a8e0e8fc568c6f981cbd889b0cc3 /src/gui/setup_relations.cpp | |
| parent | 70b520b1e876f9698bb95baa2d274ea289a0c6bd (diff) | |
| parent | 99771a1fb50286fdb0b511f425312503e657eddc (diff) | |
| download | manaverse-stripped1.1.10.2.tar.gz manaverse-stripped1.1.10.2.tar.bz2 manaverse-stripped1.1.10.2.tar.xz manaverse-stripped1.1.10.2.zip | |
Merge branch 'master' into strippedstripped1.1.10.2
Conflicts:
packaging/debian/watch
Diffstat (limited to 'src/gui/setup_relations.cpp')
| -rw-r--r-- | src/gui/setup_relations.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp index 489d5a818..57a51e435 100644 --- a/src/gui/setup_relations.cpp +++ b/src/gui/setup_relations.cpp @@ -228,7 +228,6 @@ public: #define ACTION_OLD "old" #define ACTION_TABLE "table" #define ACTION_STRATEGY "strategy" -#define ACTION_WHISPER_TAB "whisper tab" Setup_Relations::Setup_Relations(): mPlayerTableTitleModel(new StaticTableModel(1, COLUMNS_NR)), |