##// END OF EJS Templates
Merging upstream changes from trunk (after fixing small conflicts).
Merging upstream changes from trunk (after fixing small conflicts).
Fernando Perez -
r1872:d21e2734 merge
Show More
Name Size Modified Last Commit Author
/ IPython / frontend / cocoa / examples / IPython1Sandbox / English.lproj
InfoPlist.strings Loading ...
MainMenu.xib Loading ...