Merge pull request #703 from ovinn/master
authorNico Weber <nicolasweber@gmx.de>
Thu, 4 Dec 2014 18:05:44 +0000 (10:05 -0800)
committerNico Weber <nicolasweber@gmx.de>
Thu, 4 Dec 2014 18:05:44 +0000 (10:05 -0800)
Added *.obj ignore rule

1  2 
.gitignore

diff --cc .gitignore
Simple merge