Skip to content

Commit

Permalink
Merge branch 'master' into development-0.4.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@schnaader
schnaader committed Jan 20, 2016
2 parents 2026f1f + c82be93 commit 78fa53e
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,8 @@
*.log
*.tlog
*.pdb
*.lastbuildstate
*.lastbuildstate

# Visual Studio output directories
vs2012/Precomp/Debug
vs2012/Precomp/Release

0 comments on commit 78fa53e

Please sign in to comment.