Merge branch 'development'

2025-06-08 02:34:31 +08:00 · 2014-08-31 12:03:13 +01:00 · 2014-08-31 12:03:13 +01:00 · a690e6ba83
commit a690e6ba83
parent 63120b8998 75801cbdc8
5 changed files with 2 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -10,3 +10,4 @@ config/.history
 Thumbs.db
 *.exe
 build/
 Version v*
--- a/msvcp110.dll
+++ b/msvcp110.dll
--- a/msvcp120.dll
+++ b/msvcp120.dll
--- a/msvcr110.dll
+++ b/msvcr110.dll
--- a/msvcr120.dll
+++ b/msvcr120.dll