Merge branch 'development'

cmderdev · Aug 31, 2014 · bbcabfb · bbcabfb
2 parents 63120b8 + 75801cb
commit bbcabfb
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,5 @@ vendor/*
 config/.history
 Thumbs.db
 *.exe
-build/
+build/
+Version v*
diff --git a/msvcp110.dll b/msvcp110.dll
diff --git a/msvcp120.dll b/msvcp120.dll
diff --git a/msvcr110.dll b/msvcr110.dll
diff --git a/msvcr120.dll b/msvcr120.dll