OSDN Git Service

merged .gitignore changes
authorbadlogic <contact@badlogicgames.com>
Fri, 14 Sep 2012 16:48:15 +0000 (18:48 +0200)
committerbadlogic <contact@badlogicgames.com>
Fri, 14 Sep 2012 16:48:15 +0000 (18:48 +0200)
1  2 
.gitignore

diff --cc .gitignore
Simple merge