Ruben Daniels fddab9eef0 * Merged with master ... * Built ace Merge branch 'master' of github.com:ajaxorg/ace into feature/animscroll Conflicts: build/kitchen-sink.html build/src/ace-noconflict.js build/src/ace.js build/src/mode-c_cpp-noconflict.js build/src/mode-c_cpp.js build/src/mode-clojure-noconflict.js build/src/mode-clojure.js build/src/mode-coldfusion-noconflict.js build/src/mode-coldfusion.js build/src/mode-csharp-noconflict.js build/src/mode-csharp.js build/src/mode-css-noconflict.js build/src/mode-css.js build/src/mode-groovy-noconflict.js build/src/mode-groovy.js build/src/mode-haxe-noconflict.js build/src/mode-haxe.js build/src/mode-html-noconflict.js build/src/mode-html.js build/src/mode-java-noconflict.js build/src/mode-java.js build/src/mode-javascript-noconflict.js build/src/mode-javascript.js build/src/mode-json-noconflict.js build/src/mode-json.js build/src/mode-markdown-noconflict.js build/src/mode-markdown.js build/src/mode-php-noconflict.js build/src/mode-php.js build/src/mode-powershell-noconflict.js build/src/mode-powershell.js build/src/mode-scad-noconflict.js build/src/mode-scad.js build/src/mode-scala-noconflict.js build/src/mode-scala.js build/src/mode-svg-noconflict.js build/src/mode-svg.js build/src/mode-xml-noconflict.js build/src/mode-xml.js		2012-04-08 13:22:50 +02:00
..
ace	* Merged with master	2012-04-08 13:22:50 +02:00
pilot	add canon to migration list	2011-11-10 17:16:08 +01:00