diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-04 20:05:48 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-04 20:05:48 +0300 |
| commit | 62ec17f6e489ec50f17219444468aeb8969dc961 (patch) | |
| tree | 350d7edb5c26c282a4e1906544536d68831228ac /src/localplayer.cpp | |
| parent | 71d924d7dcdac067f02a317e9353ee067dbd0bde (diff) | |
| parent | fd484fc70fca32ff9065b91c175089b65aa3fd26 (diff) | |
| download | plus-62ec17f6e489ec50f17219444468aeb8969dc961.tar.gz plus-62ec17f6e489ec50f17219444468aeb8969dc961.tar.bz2 plus-62ec17f6e489ec50f17219444468aeb8969dc961.tar.xz plus-62ec17f6e489ec50f17219444468aeb8969dc961.zip | |
Merge branch 'master' into strippedstripped1.1.9.4
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/guichan/basiccontainer.cpp
src/guichan/include/guichan/basiccontainer.hpp
src/guichan/widgets/window.cpp
Diffstat (limited to 'src/localplayer.cpp')
| -rw-r--r-- | src/localplayer.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 5192390bc..e9386a5ee 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -78,8 +78,6 @@ #include "utils/gettext.h" #include "utils/stringutils.h" -#include <cassert> - #include "mumblemanager.h" #include "debug.h" |