Merge branch 'master' into dev

systray 1.1.0.7
Sean McArde 2016-11-06 21:57:30 -08:00
commit 033e875405
1 changed files with 2 additions and 0 deletions

2
.gitignore vendored
View File

@ -6,6 +6,8 @@
*.user
*.sln.docstates
"Setup/Setup Files/"
# Build results
[Dd]ebug/