summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2013-01-26 17:15:02 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2013-01-26 17:15:02 (GMT)
commit8e689fdd080ff24b9beb68852ff9b7c74594f119 (patch)
tree0260bce01d5e49427c6cfc364845b1f9e8c0c1d4 /.gitignore
parent3e60181dbe8fe291c27f909738a8210111557665 (diff)
parent46b767da0c14745a6cd807637249ec0b5b57b8f1 (diff)
downloadpowder-8e689fdd080ff24b9beb68852ff9b7c74594f119.zip
powder-8e689fdd080ff24b9beb68852ff9b7c74594f119.tar.gz
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index c7fe9f4..9ac6e38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,8 @@ Makefile.me
*.project
*.cproject
*.settings
+*.cbp
+*.layout
config.log
*.sconsign.dblite
*.sconf_temp