diff options
| author | Jose Antonio Marquez | 2012-02-16 16:03:55 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-16 16:03:55 -0800 |
| commit | b1d169d2dc941c7d2f51f0c557b7bf6488457742 (patch) | |
| tree | bad9b38e54ffe10de514d26539fafd7ce005d1fb /.gitignore | |
| parent | 6bc07657c8ef58e6efddd383748ecf84d1c789ad (diff) | |
| parent | be0318ed92d1fbc853568648f773322401d9c029 (diff) | |
| download | ninja-b1d169d2dc941c7d2f51f0c557b7bf6488457742.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 7 |
1 files changed, 2 insertions, 5 deletions
| @@ -8,9 +8,6 @@ images/treeControl/Thumbs.db | |||
| 8 | .DS_Store | 8 | .DS_Store |
| 9 | .project | 9 | .project |
| 10 | 10 | ||
| 11 | _scss/compass_app_log.txt | ||
| 12 | _scss/.sass-cache | ||
| 13 | |||
| 14 | js/panels/Color/colorpanelpopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc | 11 | js/panels/Color/colorpanelpopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc |
| 15 | js/panels/Color/colorpanelpopup.reel/compass_app_log.txt | 12 | js/panels/Color/colorpanelpopup.reel/compass_app_log.txt |
| 16 | js/panels/Color/colorpanelbase.reel/compass_app_log.txt | 13 | js/panels/Color/colorpanelbase.reel/compass_app_log.txt |
| @@ -21,6 +18,6 @@ js/components/gradientpicker.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78 | |||
| 21 | cloud/ | 18 | cloud/ |
| 22 | 19 | ||
| 23 | /.idea/scopes/scope_settings.xml | 20 | /.idea/scopes/scope_settings.xml |
| 24 | _scss/imports/scss/_Stage.scss | ||
| 25 | compass_app_log.txt | 21 | compass_app_log.txt |
| 26 | js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc \ No newline at end of file | 22 | js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc |
| 23 | scss/.sass-cache/ \ No newline at end of file | ||