summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Merge pull request #106 from OdyX/dev-fix-translationsPiotr Dziwiński2012-12-275-144/+462
| |\ \ \ \
| | * | | | Update translationsDidier Raboud2012-12-273-135/+369
| | * | | | Update colobot.pot using update-potDidier Raboud2012-12-271-6/+91
| | * | | | Update translation pot-file and build-targetDidier Raboud2012-12-271-3/+2
| * | | | | Merge pull request #105 from OdyX/dev-desktop-file-manPiotr Dziwiński2012-12-276-5/+324
| |\ \ \ \ \
| | * | | | | Always build manpagesDidier Raboud2012-12-271-1/+1
| | * | | | | Merge branch 'dev' into dev-desktop-file-manDidier Raboud2012-12-271-5/+5
| | |\| | | | | | | |_|_|/ | | |/| | |
| | * | | | Add manpage for colobotDidier Raboud2012-12-276-5/+324
| | | |_|/ | | |/| |
| * | | | Fixed unicode rendering bugPiotr Dziwinski2012-12-271-1/+1
| * | | | Merge pull request #107 from OdyX/dev-fix-localesPiotr Dziwiński2012-12-271-5/+8
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix locale's loadingDidier Raboud2012-12-271-5/+8
| |/ / /
| * | | Merge pull request #104 from OdyX/dev-minor-cmake-grammaer-fixMichał Zieliński2012-12-271-5/+5
| |\ \ \
| | * | | Minor cmake grammar fixDidier Raboud2012-12-271-5/+5
| * | | | Merge pull request #103 from OdyX/dev-desktop-fileMichał Zieliński2012-12-2710-1/+383
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Add SVG colobot iconDidier Raboud2012-12-274-1/+264
| | * | Add translated freedesktop 'Desktop Entry' fileDidier Raboud2012-12-279-1/+120
| |/ /
| * | * Changed Ret to Get methods in sound moduleerihel2012-12-254-93/+82
| * | * Changed log level in sound moduleerihel2012-12-255-8/+12
| * | latest changeserihel2012-12-214-8/+14
| * | sound fixerihel2012-12-2011-154/+40
| * | removing plugins for gold version (for mxe cross compiling)erihel2012-12-2021-551/+1
| * | Installation path fixes and CMakeLists refactoringPiotr Dziwinski2012-12-207-43/+55
| * | Switched data submodule to dev branchPiotr Dziwinski2012-12-191-0/+0
| * | Added colobot-data as git submodulePiotr Dziwinski2012-12-193-3/+3
| * | Merge pull request #102 from OdyX/dev-fix_cmake_flagsPiotr Dziwiński2012-12-1910-21/+49
| |\ \
| | * | Put common CXX flags in common variablesDidier Raboud2012-12-1910-12/+22
| | * | Don't enforce CMake build type on users.Didier Raboud2012-12-199-9/+27
| * | | Merge pull request #101 from OdyX/dev-reduce-dependencies-overloadPiotr Dziwiński2012-12-191-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Reduce dependencies installation in travisDidier Raboud2012-12-191-1/+1
| |/ /
| * | Merge pull request #100 from OdyX/dev-fix-rpathkrzys-h2012-12-191-1/+1
| |\ \
| | * | Fix RPath in installed colobotDidier Raboud2012-12-191-1/+1
| |/ /
| * | Merge pull request #98 from OdyX/dev-travis-ciPiotr Dziwiński2012-12-181-0/+8
| |\ \
| | * | Add travis YAML configuration file.Didier Raboud2012-12-181-0/+8
| |/ /
| * | Merge pull request #97 from OdyX/dev-minor-cmake-grammar-fixkrzys-h2012-12-182-3/+3
| |\ \
| | * | Minor cmake grammar fixDidier Raboud2012-12-182-3/+3
| * | | Merge pull request #96 from OdyX/dev-build-dockrzys-h2012-12-182-2/+15
| |\ \ \ | | |/ / | |/| |
| | * | Allow building and installation of documentationDidier Raboud2012-12-172-2/+15
| |/ /
| * | Merge pull request #95 from OdyX/dev-move-cbot-to-private-libErihel2012-12-173-4/+7
| |\ \
| | * | Install libCBot to a private directoryDidier Raboud2012-12-173-4/+7
| |/ /
| * | Merge pull request #91 from OdyX/dev-use-installed-i18nErihel2012-12-162-3/+2
| |\ \
| | * \ Merge branch 'dev' into dev-use-installed-i18nDidier Raboud2012-12-163-3/+6
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #92 from OdyX/dev-default-datadirErihel2012-12-163-4/+8
| |\ \ \
| | * | | Set a default datadir, in sync with the data installation path.Didier Raboud2012-12-163-4/+8
| |/ / /
| | * / Use default installation paths for i18n.Didier Raboud2012-12-162-4/+4
| |/ /
| * | Merge pull request #89 from OdyX/dev-fix-gmockErihel2012-12-160-0/+0
| |\ \ | | |/ | |/|
| | * Fix Google Mock system library buildingDidier Raboud2012-12-161-1/+5
| * | GMock: fixed using system packagePiotr Dziwinski2012-12-161-1/+5
| |/
| * Split gtest and gmock, fixed using system packagesPiotr Dziwinski2012-12-1637-440/+465
| * Merge branch 'master' into devPiotr Dziwinski2012-12-1512-3938/+5758
| |\
| | * Reverted lib/, fixed gtest path in CMakeLists.txtPiotr Dziwinski2012-12-1440-3/+30658