Merge branch 'master' of git@github.com:280north/cappuccino

tjsnell · Oct 28, 2009 · 95b9ea3 · 95b9ea3
2 parents ba84e6d + 42611f3
commit 95b9ea3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Objective-J/Tools/objj/lib-js/objj/objjc.js b/Objective-J/Tools/objj/lib-js/objj/objjc.js
@@ -3,8 +3,9 @@ var FILE = require("file"),
     objj = require("./objj"),
     objj_preprocess = objj.objj_preprocess,
     IS_FILE = objj.IS_FILE,
-    GET_CODE = objj.GET_CODE,
     IS_LOCAL = objj.IS_LOCAL,
+    GET_CODE = objj.GET_CODE,
+    GET_FILE = objj.GET_FILE,
     MARKER_IMPORT_STD = objj.MARKER_IMPORT_STD,
     MARKER_IMPORT_LOCAL = objj.MARKER_IMPORT_LOCAL,
     MARKER_CODE = objj.MARKER_CODE,