diff options
| author | Ananya Sen | 2012-01-31 07:00:49 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-01-31 07:00:49 -0800 |
| commit | 61ff730a1897890f71403cbfac4d15269e2d271f (patch) | |
| tree | 4a2893e935c259ec9fbe9446d64af5172ec6299d /.gitignore | |
| parent | 906776893138257f96a0530674eda456ca3d817b (diff) | |
| parent | 6dc03672707a91085954359d82c14bd876f85b12 (diff) | |
| download | ninja-61ff730a1897890f71403cbfac4d15269e2d271f.tar.gz | |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts:
_scss/imports/scss/_Stage.scss
js/io/system/coreioapi.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
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 | ||