History | View | Annotate | Download (293 Bytes)
Merge branch 'master' into wxAui
Conflicts:
CMakeLists.txt git-stat.sh src/battlemaptab.cpp src/utils.h
changed all git commands to "new" style
Revert "new icon trial"
This reverts commit 87c3461ae12f24db5febb758f9c5676edcef4f1e.
new icon trial