aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-02 00:20:39 -0800
committerValerio Virgillito2012-02-02 00:20:39 -0800
commit7303d3a7c3913658bf33be5f99db85a30889cfd9 (patch)
tree45c55830b5971bdec183ac64217716c7a2fc6b47 /.gitignore
parenta1ad71231368f459f1d842d77185f333f04c58ec (diff)
parent2e24eaa71b260fd11632d8a124874b238c9aa82a (diff)
downloadninja-7303d3a7c3913658bf33be5f99db85a30889cfd9.tar.gz
Merge branch 'pullrequest' of github.com:jreid01/ninja-internal into staging
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