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/being.cpp | |
| parent | 70b520b1e876f9698bb95baa2d274ea289a0c6bd (diff) | |
| parent | 99771a1fb50286fdb0b511f425312503e657eddc (diff) | |
| download | mv-f1e92aca00a4859047e83fab76220767b9a2f814.tar.gz mv-f1e92aca00a4859047e83fab76220767b9a2f814.tar.bz2 mv-f1e92aca00a4859047e83fab76220767b9a2f814.tar.xz mv-f1e92aca00a4859047e83fab76220767b9a2f814.zip | |
Merge branch 'master' into strippedstripped1.1.10.2
Conflicts:
packaging/debian/watch
Diffstat (limited to 'src/being.cpp')
| -rw-r--r-- | src/being.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/being.cpp b/src/being.cpp index 532e6e2cf..2ed05449a 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -84,7 +84,6 @@ #include "debug.h" #define CACHE_SIZE 50 -#define HAIR_FILE "hair.xml" static const int DEFAULT_BEING_WIDTH = 32; static const int DEFAULT_BEING_HEIGHT = 32; |