5.5 merge

This commit is contained in:
Sergei Golubchik 2013-06-06 17:51:28 +02:00
commit 4749d40c63
464 changed files with 7733 additions and 3067 deletions

View file

@ -332,8 +332,8 @@ INCLUDE(cmake/abi_check.cmake)
INCLUDE(cmake/tags.cmake)
IF(WIN32)
ADD_SUBDIRECTORY(win/packaging)
ADD_SUBDIRECTORY(win/upgrade_wizard)
ADD_SUBDIRECTORY(win/packaging)
ENDIF()
CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/my_config.h)