aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Guzman2012-03-12 15:33:04 -0700
committerEric Guzman2012-03-12 15:33:04 -0700
commit7e3161153b87b891875ac65368a19aed12909fa3 (patch)
treeb80f48d711a9729fc39dbbdff28c4f0620e7302d
parent7a28932ba8a7517bbaaabe1f5edf678416aafc9c (diff)
parent69d90467865a1384725b2301901be2180c5a841f (diff)
downloadninja-7e3161153b87b891875ac65368a19aed12909fa3.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
-rwxr-xr-xcss/ninja.css21
-rw-r--r--[-rwxr-xr-x]imports/codemirror/LICENSE4
-rw-r--r--[-rwxr-xr-x]imports/codemirror/keymap/emacs.js0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/keymap/vim.js277
-rw-r--r--[-rwxr-xr-x]imports/codemirror/lib/codemirror.css12
-rw-r--r--[-rwxr-xr-x]imports/codemirror/lib/codemirror.js554
-rw-r--r--[-rwxr-xr-x]imports/codemirror/lib/util/dialog.css0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/lib/util/dialog.js0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/lib/util/foldcode.js120
-rw-r--r--[-rwxr-xr-x]imports/codemirror/lib/util/formatting.js9
-rw-r--r--[-rwxr-xr-x]imports/codemirror/lib/util/javascript-hint.js67
-rw-r--r--imports/codemirror/lib/util/match-highlighter.js44
-rw-r--r--[-rwxr-xr-x]imports/codemirror/lib/util/overlay.js0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/lib/util/runmode.js38
-rw-r--r--[-rwxr-xr-x]imports/codemirror/lib/util/search.js0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/lib/util/searchcursor.js0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/lib/util/simple-hint.css0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/lib/util/simple-hint.js0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/clike/clike.js19
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/clike/index.html2
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/clojure/clojure.js2
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/clojure/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/coffeescript/LICENSE0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/coffeescript/coffeescript.js90
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/coffeescript/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/css/css.js0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/css/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/diff/diff.css0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/diff/diff.js0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/diff/index.html0
-rw-r--r--imports/codemirror/mode/ecl/ecl.js203
-rw-r--r--imports/codemirror/mode/ecl/index.html42
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/gfm/gfm.js2
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/gfm/index.html0
-rw-r--r--imports/codemirror/mode/go/go.js170
-rw-r--r--imports/codemirror/mode/go/index.html72
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/groovy/groovy.js0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/groovy/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/haskell/haskell.js0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/haskell/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/htmlembedded/htmlembedded.js0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/htmlembedded/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/htmlmixed/htmlmixed.js0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/htmlmixed/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/javascript/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/javascript/javascript.js4
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/jinja2/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/jinja2/jinja2.js0
-rw-r--r--imports/codemirror/mode/less/index.html588
-rw-r--r--imports/codemirror/mode/less/less.js189
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/lua/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/lua/lua.js0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/markdown/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/markdown/markdown.js82
-rw-r--r--imports/codemirror/mode/mysql/index.html41
-rw-r--r--imports/codemirror/mode/mysql/mysql.js188
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/ntriples/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/ntriples/ntriples.js0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/pascal/LICENSE0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/pascal/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/pascal/pascal.js48
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/perl/LICENSE0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/perl/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/perl/perl.js2
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/php/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/php/php.js78
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/plsql/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/plsql/plsql.js0
-rwxr-xr-ximports/codemirror/mode/properties/index.html40
-rwxr-xr-ximports/codemirror/mode/properties/properties.css3
-rwxr-xr-ximports/codemirror/mode/properties/properties.js57
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/python/LICENSE.txt0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/python/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/python/python.js41
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/r/LICENSE0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/r/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/r/r.js0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/rpm/changes/changes.js0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/rpm/changes/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/rpm/spec/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/rpm/spec/spec.css0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/rpm/spec/spec.js2
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/rst/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/rst/rst.js0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/ruby/LICENSE0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/ruby/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/ruby/ruby.js17
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/rust/index.html6
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/rust/rust.js51
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/scheme/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/smalltalk/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/smalltalk/smalltalk.js32
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/sparql/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/sparql/sparql.js0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/stex/index.html2
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/stex/stex.js0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/tiddlywiki/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/tiddlywiki/tiddlywiki.css0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/tiddlywiki/tiddlywiki.js0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/velocity/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/velocity/velocity.js0
-rw-r--r--imports/codemirror/mode/verilog/index.html210
-rw-r--r--imports/codemirror/mode/verilog/verilog.js194
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/xml/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/xml/xml.js35
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/xmlpure/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/xmlpure/xmlpure.js5
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/yaml/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/yaml/yaml.js0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/theme/cobalt.css2
-rw-r--r--[-rwxr-xr-x]imports/codemirror/theme/eclipse.css0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/theme/elegant.css0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/theme/monokai.css2
-rw-r--r--[-rwxr-xr-x]imports/codemirror/theme/neat.css0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/theme/night.css2
-rw-r--r--[-rwxr-xr-x]imports/codemirror/theme/rubyblue.css2
-rwxr-xr-ximports/codemirror/version.txt2
-rwxr-xr-xindex.html16
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.js2
-rwxr-xr-xjs/controllers/color-controller.js4
-rwxr-xr-xjs/controllers/document-controller.js18
-rwxr-xr-xjs/controllers/elements/shapes-controller.js17
-rwxr-xr-xjs/controllers/elements/stage-controller.js2