diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /.gitignore | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
| @@ -23,3 +23,5 @@ js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cl | |||
| 23 | scss/.sass-cache/ | 23 | 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 | |||
| 27 | .sass-cache \ No newline at end of file | ||