oh yeah. And merge again, I always forget to update first
glob:CMakeCache.txt
glob:CMakeFiles
glob:moc_*.cxx
glob:qrc_*.cxx
glob:*.o
glob:Makefile
glob:bin
glob:*.hi
glob:*.*~
glob:*.core
glob:hedgewars/config.inc
glob:cmake_install.cmake
glob:QTfrontend/hwconsts.cpp
glob:CPackConfig.cmake
glob:CPackSourceConfig.cmake
glob:tools/cmake_uninstall.cmake
glob:install_manifest.txt
glob:.DS_Store
glob:*.swp
glob:*.orig
glob:*.diff
glob:project_files/HedgewarsMobile/Data/
glob:project_files/HedgewarsMobile/build/
glob:project_files/HedgewarsMobile/Hedgewars.xcodeproj/vittorio.*
glob:moc_*.cxx_parameters