hiker 3d5fbaa92f Merge branch 'master' of https://github.com/gupascal/stk-code into gupascal-master
Fixed some merging issues.
Conflicts:
	data/achievements.xml
	src/achievements/achievement_info.hpp
2014-03-18 10:44:11 +11:00
..
2014-01-09 01:32:17 +00:00
2014-01-06 02:55:37 +00:00
2013-08-30 18:46:11 +00:00
2013-08-30 18:46:11 +00:00