Merge branch 'develop'

andanteyk · Nov 19, 2017 · 00d55e1 · 00d55e1
2 parents ffe6217 + b05a2c1
commit 00d55e1
Show file tree

Hide file tree

Showing 351 changed files with 28,708 additions and 22,766 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@
 *.suo
 *.user
 *.sln.docstates
+.vs/
 
 # Build results
 
@@ -161,3 +162,8 @@ $RECYCLE.BIN/
 ElectronicObserver/Other/Information/todo.txt
 DigitalArsenal/
 packages/
+/ElectronicObserver/zip.bat
+/ElectronicObserver/Settings
+/ElectronicObserver/Record
+/ElectronicObserver/ErrorReport
+/ElectronicObserver/BattleLog
diff --git a/Browser/FormBrowser.Designer.cs b/Browser/FormBrowser.Designer.cs