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

This commit is contained in:
Tom Robinson committed 2010-01-26 23:50:41 -08:00
commit f5fe15d6cb
3 files changed
+2 -2

No files matched your search

File renamed without changes.

Before

Width:  |  Height:  |  Size: 137 B

After

Width:  |  Height:  |  Size: 137 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 164 B

After

Width:  |  Height:  |  Size: 164 B

+2 -2
View File
@@ -168,7 +168,7 @@ CPOperationQueuePriorityVeryHigh = 8;
The JS function that should be run after the main method
@return JS function
*/
– (JSObject)completionFunction
- (JSObject)completionFunction
{
return _completionFunction;
}
@@ -290,4 +290,4 @@ CPOperationQueuePriorityVeryHigh = 8;
}
}
@end
@end