aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-15 16:09:47 -0800
committerValerio Virgillito2012-02-15 16:09:47 -0800
commitd366c0bd1af6471511217ed574083e15059519b5 (patch)
treec8c9f9af761457e3c5f4c6774fb0fbba851df0c4 /.gitignore
parent997ce3fb65f27b3d6f331f63b5dc22d3c7fb8f1e (diff)
parentb85bfb54aaca3ccca3c1ef09115de925cd67f4e9 (diff)
downloadninja-d366c0bd1af6471511217ed574083e15059519b5.tar.gz
Merge branch 'refs/heads/integration'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 3a3a8d67..6c288e8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,6 @@ js/components/gradientpicker.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78
21cloud/ 21cloud/
22 22
23/.idea/scopes/scope_settings.xml 23/.idea/scopes/scope_settings.xml
24/_scss/compass_app_log.txt \ No newline at end of file 24_scss/imports/scss/_Stage.scss
25compass_app_log.txt
26js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc \ No newline at end of file