merge with master

jpolitz · jpolitz · commit 4cc12fa2eeea · 2014-05-08T10:53:03.000-04:00
diff --git a/src/web/repl-ui.js b/src/web/repl-ui.js
@@ -1,4 +1,4 @@
-define(["trove/image-lib", "./check-ui", "./error-ui", "./output-ui", "trove/world-lib"], function(imageLib, checkUI, errorUI, outputUI, worldLib) {
+define(["trove/image-lib", "./check-ui.js", "./error-ui.js", "./output-ui.js", "trove/world-lib"], function(imageLib, checkUI, errorUI, outputUI, worldLib) {
   function merge(obj, extension) {
     var newobj = {};
     Object.keys(obj).forEach(function(k) {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-define(["trove/image-lib", "./check-ui", "./error-ui", "./output-ui", "trove/world-lib"], function(imageLib, checkUI, errorUI, outputUI, worldLib) {`
	`1`	`+define(["trove/image-lib", "./check-ui.js", "./error-ui.js", "./output-ui.js", "trove/world-lib"], function(imageLib, checkUI, errorUI, outputUI, worldLib) {`
`2`	`2`	`function merge(obj, extension) {`
`3`	`3`	`var newobj = {};`
`4`	`4`	`Object.keys(obj).forEach(function(k) {`