aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-21 09:55:19 -0700
committerJose Antonio Marquez2012-06-21 09:55:19 -0700
commitbf6bed611714053aabc0d38978bddd62873d04aa (patch)
treef648fa7842f3dc6011da08aaab0bedb445d43b58 /.gitignore
parent54b15b3c39835ea999d9ddd8038a5531630e266d (diff)
parentc8fc6d15e1570e89243abe527cd149e354f7e11f (diff)
downloadninja-bf6bed611714053aabc0d38978bddd62873d04aa.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 42e99c16..10388811 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@ js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cl
23scss/.sass-cache/ 23scss/.sass-cache/
24js/helper-classes/RDGE/src/tools/compiler.jar 24js/helper-classes/RDGE/src/tools/compiler.jar
25js/panels/Timeline/TimelinePanel.reel/scss/compass_app_log.txt 25js/panels/Timeline/TimelinePanel.reel/scss/compass_app_log.txt
26
27.sass-cachejs/panels/Timeline/Span.reel/scss/compass_app_log.txt