Permalink
Browse files

Merge branch 'bugfixes' into 3.1

  • Loading branch information...
2 parents 7c76d4e + 1e5fafa commit 050866e4008f8ebb24bceb8ce9422757151d4baa automerge committed with cybersphinx Aug 6, 2012
Showing 784 changed files with 1,016 additions and 937 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
Oops, something went wrong.

0 comments on commit 050866e

Please sign in to comment.