Merge branch 'master' of github.com:ajaxorg/ace

Conflicts:
	build/demo/kitchen-sink.js
	build/kitchen-sink.html
This commit is contained in:
Fabian Jakobs 2011-09-28 12:25:26 +02:00
commit 7fd597a1b0
8 changed files with 8 additions and 8 deletions

View file

@ -11,7 +11,7 @@
Ace
version 0.2.0
commit 314b95eb78f44270330a61883bc320735697b7af
commit 3a0ec51aef11f74857b6a285b9c36a0b9118ca89
-->