diff options
| author | Jose Antonio Marquez | 2012-01-30 18:25:03 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-01-30 18:25:03 -0800 |
| commit | 6dc03672707a91085954359d82c14bd876f85b12 (patch) | |
| tree | b213ff3f082341797c59b4643fbcb5e7d50ccbb4 /.gitignore | |
| parent | 3b4291c783c4b8fb07f111a240049069277f3c49 (diff) | |
| parent | 682f895b42863fc36574f04aa930b7d4c9a1c114 (diff) | |
| download | ninja-6dc03672707a91085954359d82c14bd876f85b12.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
_scss/compass_app_log.txt
_scss/imports/scss/_Stage.scss
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 3 insertions, 1 deletions
| @@ -20,4 +20,6 @@ js/components/gradientpicker.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78 | |||
| 20 | 20 | ||
| 21 | cloud/ | 21 | cloud/ |
| 22 | 22 | ||
| 23 | /.idea/scopes/scope_settings.xml \ No newline at end of file | 23 | /.idea/scopes/scope_settings.xml |
| 24 | _scss/imports/scss/_Stage.scss | ||
| 25 | compass_app_log.txt \ No newline at end of file | ||