diff options
| author | Jon Reid | 2012-04-05 16:36:22 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-04-05 16:36:22 -0700 |
| commit | eb694fa5d39733264bce7ba832aabbe9c3d6c81e (patch) | |
| tree | 049aaa66a6621e9f54b33b9861f50c20667ba0e3 /.gitignore | |
| parent | a8ea8f377919c7f1a6af69311f55fd57727d9058 (diff) | |
| parent | e186c49247689b5c2df6125037e2473636701d17 (diff) | |
| download | ninja-eb694fa5d39733264bce7ba832aabbe9c3d6c81e.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
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 | ||