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 /imports/codemirror/version.txt | |
| 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 'imports/codemirror/version.txt')
| -rwxr-xr-x | imports/codemirror/version.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/version.txt b/imports/codemirror/version.txt index 2563e071..9d5872c6 100755 --- a/imports/codemirror/version.txt +++ b/imports/codemirror/version.txt | |||
| @@ -1 +1 @@ | |||
| Codemirror Version: 2.22 \ No newline at end of file | Codemirror Version: 2.23 \ No newline at end of file | ||