diff options
| author | Jonathan Duran | 2012-04-05 08:09:18 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-04-05 08:09:18 -0700 |
| commit | e186c49247689b5c2df6125037e2473636701d17 (patch) | |
| tree | e626b006027949f87b5aa1e76eb0ed719adb99bb /.gitignore | |
| parent | 135c5257e2a4d5f1b25f62758c6783fd2ebe5e19 (diff) | |
| parent | 17ca01f54591187f5c0812c0fd2cb7260afa9639 (diff) | |
| download | ninja-e186c49247689b5c2df6125037e2473636701d17.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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 | ||