diff options
author | Eric Guzman | 2012-04-05 18:42:40 -0700 |
---|---|---|
committer | Eric Guzman | 2012-04-05 18:42:40 -0700 |
commit | 8ff9dde2053e41d85bb27d9c91808a30e551a138 (patch) | |
tree | 8eec67d632d82d3052ed470096eda13fd50a55c8 /.gitignore | |
parent | 4631d54ffb4942378835689e9f5d70ed95610822 (diff) | |
parent | 7656b6eac7aec59697c6cddbe2a507fe9e4aa187 (diff) | |
download | ninja-8ff9dde2053e41d85bb27d9c91808a30e551a138.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -20,4 +20,5 @@ cloud/ | |||
20 | /.idea/scopes/scope_settings.xml | 20 | /.idea/scopes/scope_settings.xml |
21 | compass_app_log.txt | 21 | compass_app_log.txt |
22 | js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc | 22 | js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc |
23 | scss/.sass-cache/ \ No newline at end of file | 23 | scss/.sass-cache/ |
24 | js/helper-classes/RDGE/src/tools/compiler.jar | ||