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/serverdialog.h | |
| 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/serverdialog.h')
| -rw-r--r-- | src/gui/serverdialog.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h index a5f5f3ee0..39c6f94f7 100644 --- a/src/gui/serverdialog.h +++ b/src/gui/serverdialog.h @@ -95,7 +95,11 @@ class TypeListModel : public gcn::ListModel * Used to get number of line in the list */ int getNumberOfElements() +#ifdef MANASERV_SUPPORT + { return 3; } +#else { return 2; } +#endif /** * Used to get an element from the list |