Merge from head -- breakage

[selectricity-live] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index d2da80804ce572d300f6ad75a209f1da2d77b318..1e24ca1b87d4ae5f09a2ecb818ea9d3fadf41bdc 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -4,3 +4,5 @@ production.log
 server.log
 test.log
 tmp
+public/engine_files
+.DS_Store