aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-21 09:55:35 -0700
committerJose Antonio Marquez2012-06-21 09:55:35 -0700
commit28aa1276ffb6cefca7f7d58906cf8380fc6253eb (patch)
treec9a4a6f5d18693c39fbc668567125211151c9213 /.gitignore
parent4eff115126ab946c5852d787fd596e07b156c9a5 (diff)
parentc8fc6d15e1570e89243abe527cd149e354f7e11f (diff)
downloadninja-28aa1276ffb6cefca7f7d58906cf8380fc6253eb.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
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