jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote branch 'remotes/mozilla/master'

Browse source 
Conflicts:
	demo/editor-build.html
	demo/editor.html
This commit is contained in:
Fabian Jakobs 2010-12-10 16:54:14 +01:00
commit f7c217d7a4
108 changed files with 8340 additions and 1335 deletions
Download patch file Download diff file Expand all files Collapse all files

34
build.js
View file

@ -29,44 +29,44 @@
"ace/document",
"ace/undomanager",
"ace/virtual_renderer",
"ace/mode/javascript",
"ace/theme/textmate"
],
includeRequire: false
},
{
name: "ace/theme/eclipse",
{
name: "ace/theme/eclipse",
exclude: [
"ace/lib/lang",
"ace/lib/dom",
"ace/lib/oop"
"pilot/lang",
"pilot/dom",
"pilot/oop"
]
},
{
{
name: "ace/mode/xml",
exclude: [
"ace/lib/oop",
"pilot/oop",
"ace/tokenizer",
"ace/mode/text"
"ace/mode/text"
]
},
{
{
name: "ace/mode/css",
exclude: [
"ace/lib/oop",
"ace/lib/lang",
"pilot/oop",
"pilot/lang",
"ace/tokenizer",
"ace/range",
"ace/mode/text"
"ace/mode/text"
]
},
{
{
name: "ace/mode/html",
exclude: [
"ace/lib/oop",
"ace/lib/lang",
"pilot/oop",
"pilot/lang",
"ace/tokenizer",
"ace/range",
"ace/mode/text",