Merge remote-tracking branch 'iebuggy/master'

Conflicts:
	support/pilot
This commit is contained in:
Fabian Jakobs 2011-07-25 15:31:17 +02:00
commit a15688ce00
3 changed files with 200 additions and 1 deletions

View file

@ -93,6 +93,7 @@
<option value="ace/theme/twilight">Twilight</option>
<option value="ace/theme/clouds">Clouds</option>
<option value="ace/theme/clouds_midnight">Clouds Midnight</option>
<option value="ace/theme/crimson_editor">Crimson Editor</option>
<option value="ace/theme/kr_theme">krTheme</option>
<option value="ace/theme/mono_industrial">Mono Industrial</option>
<option value="ace/theme/monokai">Monokai</option>