diff options
author | Valerio Virgillito | 2012-04-04 15:58:49 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-04 15:58:49 -0700 |
commit | 347b4179be5581841fc94825dcb18901e625c670 (patch) | |
tree | 93556d56b049aa47c615a8b58add230cd96da166 /.gitignore | |
parent | 9f1806a7134ec4744a8009e6a7467f5cea04cabf (diff) | |
parent | e721a7c1009f298a1bd8fea583da14535e039880 (diff) | |
download | ninja-347b4179be5581841fc94825dcb18901e625c670.tar.gz |
Merge branch 'refs/heads/master' into components
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 | ||