diff options
| author | Jonathan Duran | 2012-05-24 09:35:17 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-24 09:35:17 -0700 |
| commit | 9809c96d96c24a512f6da1efbf44f174ca9321fe (patch) | |
| tree | fa87aeee120500e57d1077c6c0c01a6cc717e144 /.gitignore | |
| parent | 458714f5bf2ab095f6e96dfec3f9ff7042527c04 (diff) | |
| parent | a8dff9f5cb9dec84e6805118d49903710b361275 (diff) | |
| download | ninja-9809c96d96c24a512f6da1efbf44f174ca9321fe.tar.gz | |
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -24,4 +24,4 @@ scss/.sass-cache/ | |||
| 24 | js/helper-classes/RDGE/src/tools/compiler.jar | 24 | js/helper-classes/RDGE/src/tools/compiler.jar |
| 25 | js/panels/Timeline/TimelinePanel.reel/scss/compass_app_log.txt | 25 | js/panels/Timeline/TimelinePanel.reel/scss/compass_app_log.txt |
| 26 | 26 | ||
| 27 | .sass-cache \ No newline at end of file | 27 | .sass-cachejs/panels/Timeline/Span.reel/scss/compass_app_log.txt |