##// END OF EJS Templates
Merging latest trunk....
Merging latest trunk. I got a criss-cross merge in this and did merge --weave. Hope this is OK.
Brian Granger -
r1890:c3323314 merge
Show More
Name Size Modified Last Commit Author
/ IPython / frontend / cocoa / examples / IPython1Sandbox
English.lproj
IPython1Sandbox.xcodeproj
IPython1SandboxAppDelegate.py Loading ...
IPython1Sandbox_Prefix.pch Loading ...
IPythonCocoaController Tests-Info.plist Loading ...
Info.plist Loading ...
main.m Loading ...
main.py Loading ...