Permalink
Browse files

Merge remote-tracking branch 'origin' into newterrain

  • Loading branch information...
2 parents 62cd82c + b30458e commit bb8c46cb2df7d7ab06f0b2b8b57259888291e3dc @haoNoQ haoNoQ committed Aug 8, 2012
Showing 800 changed files with 1,077 additions and 1,015 deletions.
View
@@ -268,10 +268,6 @@ warzone*.*build
# profiler stuff
win32/CodeAnalyst
-# Split img files
-data/base/images/frontend/
-data/base/images/intfac/
-
# Tests
/tests/jslist.txt
/tests/maplist.txt
View
@@ -2,6 +2,7 @@
* General:
* Change: Allow multiple AIs with similar names (commit:ee95d785bdfd72a490863d7cdb3f504f88f9eecd)
* Change: Increase the maximum number of terrain tiles (commit:ab44eafb7bd1daa2d0f4efe367673b4c2985a05d)
+ * Change: No longer save last map played (ticket:3618)
* Fix: Saving the game might crash it (ticket:3620, commit:fdb1c0b52153d3368ae79e8f0befdd2744b43692)
* Fix: Qt backend compatibility with Qt 4.8.2 (ticket:3562, commit:df32833ab8b17e6db5815b7eca9f5fe01a5b7f8f)
* Fix: Scavengers in challenges were always disabled (ticket:3630, commit:95677b02b9959b05372e7dc10286fe184bfd6cdd)
Oops, something went wrong.

0 comments on commit bb8c46c

Please sign in to comment.