diff options
author | hwc487 | 2012-02-03 09:33:35 -0800 |
---|---|---|
committer | hwc487 | 2012-02-03 09:33:35 -0800 |
commit | 7dd20aec0a91731c2acaa0abfa66b754b6c82fe6 (patch) | |
tree | 278b656279d028d4d20ac5345837f1eb87ba4192 /.gitignore | |
parent | e02deaf0d1b1f7dbcf022442cb730490ac8cee8b (diff) | |
parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
download | ninja-7dd20aec0a91731c2acaa0abfa66b754b6c82fe6.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into working
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -20,4 +20,5 @@ 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/compass_app_log.txt \ No newline at end of file | ||