@@ -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, Objective-J/Tools/objj/lib-js/objj/objjc.js ba84e6d3e26d7a4be222fe7fe42cdb6bef3dfa3b 42611f3a8431956ee226a4c18967efd6891c3176 Ross Boucher ross@280north.com http://github.com/sethtrain/cappuccino/commit/95b9ea336bb4d3766e382e37930b076c06548291 95b9ea336bb4d3766e382e37930b076c06548291 2009-10-28T00:12:29-07:00 2009-10-28T00:12:29-07:00 Merge branch 'master' of git@github.com:280north/cappuccino 46d1d5e7b5088c3b279bb627dd22de24a2029535 Ross Boucher ross@280north.com