aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorhwc4872012-02-03 09:33:35 -0800
committerhwc4872012-02-03 09:33:35 -0800
commit7dd20aec0a91731c2acaa0abfa66b754b6c82fe6 (patch)
tree278b656279d028d4d20ac5345837f1eb87ba4192 /.gitignore
parente02deaf0d1b1f7dbcf022442cb730490ac8cee8b (diff)
parentc630ead20487c3948fa36448d3e7d5f7b5cba782 (diff)
downloadninja-7dd20aec0a91731c2acaa0abfa66b754b6c82fe6.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into working
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index b92bd629..3a3a8d67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,5 @@ js/components/gradientpicker.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78
20 20
21cloud/ 21cloud/
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