aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAnanya Sen2012-02-01 12:00:04 -0800
committerAnanya Sen2012-02-01 12:00:04 -0800
commitcac299b27fcd9e317a391236502f513f215e8d2d (patch)
treefc2fb9e341b04694ef7966d84b26e7707ee53f1b /.gitignore
parent553fce7721cacfd13b6013fdcdd0243c90083b5e (diff)
parentd74910a897f2db920f6f67d922532d245074c8f7 (diff)
downloadninja-cac299b27fcd9e317a391236502f513f215e8d2d.tar.gz
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index fd016bd0..6c288e8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,5 @@ cloud/
22 22
23/.idea/scopes/scope_settings.xml 23/.idea/scopes/scope_settings.xml
24_scss/imports/scss/_Stage.scss 24_scss/imports/scss/_Stage.scss
25compass_app_log.txt \ No newline at end of file 25compass_app_log.txt
26js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc \ No newline at end of file