Merge branch 'master' of git.assembla.com:terraria into api

Conflicts: .gitignore
2011-05-30 02:50:31 -06:00 · 2011-05-30 02:50:31 -06:00 · 3ccdba9f51
commit 3ccdba9f51
parent ef60c83b40 21c2f70154
4 changed files with 70 additions and 9 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,6 +6,8 @@
 *.exe
 *.o
 *.so
+/bin/*
+/obj/*

 # Packages #
 ############
@ -32,8 +34,6 @@
 ehthumbs.db
 Icon?
 Thumbs.db
-/bin
-/obj


 # Visual Studio shit Motherfucka #
@ -43,4 +43,5 @@ Thumbs.db
 *.opensdf
 *.cache
 *.txt
-*.pdb
+*.pdb
+*.csproj.user