Merge branch 'master-redesign' into master-redesign-templates-and-blog

This commit is contained in:
Henry Oswald 2014-07-08 12:45:13 +01:00
commit 521c7f9485
2 changed files with 3 additions and 3 deletions

View file

@ -1,6 +1,6 @@
define [ define [
"ide/editor/auto-complete/SuggestionManager" "ide/editor/directives/aceEditor/auto-complete/SuggestionManager"
"ide/editor/auto-complete/Snippets" "ide/editor/directives/aceEditor/auto-complete/Snippets"
"ace/autocomplete/util" "ace/autocomplete/util"
"ace/autocomplete" "ace/autocomplete"
"ace/range" "ace/range"

View file

@ -1,5 +1,5 @@
define [ define [
"ide/editor/spell-check/HighlightedWordManager" "ide/editor/directives/aceEditor/spell-check/HighlightedWordManager"
"ace/range" "ace/range"
], (HighlightedWordManager) -> ], (HighlightedWordManager) ->
Range = require("ace/range").Range Range = require("ace/range").Range