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

This commit is contained in:
Tom Robinson committed 2008-11-18 18:15:29 -08:00
commit fbb3959e66
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -235,7 +235,7 @@
@end
var CPTimersTimeoutID = 1000,
CPTimersForTimeoutIDs = {}
CPTimersForTimeoutIDs = {};
var _CPTimerBridgeTimer = function(codeOrFunction, aDelay, shouldRepeat, functionArgs)
{
+1 -1
View File
@@ -105,7 +105,7 @@ function objj_printf(string)
objj_fprintf(alert, string);
}
#if COMPILER
#if RHINO
importPackage(java.lang);
warning_stream = function (aString) { System.out.println(aString) };