Merge branch 'development'

2025-01-11 00:39:08 +08:00 · 2014-08-31 12:03:13 +01:00 · 2014-08-31 12:03:13 +01:00 · bbcabfb730
commit bbcabfb730
parent 63120b8998 75801cbdc8
5 changed files with 2 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -9,4 +9,5 @@ vendor/*
 config/.history
 Thumbs.db
 *.exe
-build/
+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