diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-01-22 02:20:43 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-01-22 02:20:43 +0300 |
| commit | e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914 (patch) | |
| tree | 4e9f65c3ef67e6e06e1e1dca140e2d7ef6a22ff7 /build/pmake | |
| parent | b6eb53b9abdf48b88cb1978b9af97f2a879d2717 (diff) | |
| parent | acc25a7dffefb8b8b4e8022af918794d26048453 (diff) | |
| download | plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.gz plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.bz2 plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.xz plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.zip | |
Merge commit 'v1.2.1.22' into stripped
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/CMakeLists.txt
src/Makefile.am
src/guichan/gui.cpp
Diffstat (limited to 'build/pmake')
| -rwxr-xr-x | build/pmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/pmake b/build/pmake index 7ad12eaec..b51e40734 100755 --- a/build/pmake +++ b/build/pmake @@ -4,8 +4,8 @@ cd .. dir=`pwd` -export CC=gcc-4.5 -export CXX=g++-4.5 +export CC=gcc-4.6 +export CXX=g++-4.6 #-D_GLIBCXX_PROFILE |