merge from v3_1

This commit is contained in:
Vadim Kurland
2009-10-03 20:25:21 +00:00
3 changed files with 5 additions and 2 deletions
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 1541
#define BUILD_NUM 1543
+3
View File
@@ -434,6 +434,9 @@ then
ccache -s
fi
AC_PATH_PROG(DISTCC, distcc, , )
AC_SUBST(DISTCC)
dnl AC_CONFIG_FILES([ Main.make ])
AC_CONFIG_FILES([ qmake.inc ])
+1 -1
View File
@@ -22,7 +22,7 @@ unix {
FWBPARSER_LIB = ../parsers/libfwbparser.a
FWTRANSFER_LIB = ../fwtransfer/libfwtransfer.a
QMAKE_CXX = @CCACHE@ g++
QMAKE_CXX = @CCACHE@ @DISTCC@ g++
!macx {