##// END OF EJS Templates
Merge branch 'master' into kernelmanager...
Merge branch 'master' into kernelmanager Conflicts: IPython/utils/traitlets.py

File last commit:

r2661:595fc3b9
r2752:5016a14f merge
Show More
Makefile
5 lines | 145 B | text/x-makefile | MakefileLexer
include ./plugins.mk
all : dist/IPythonCocoaController.plugin
dist/IPythonCocoaController.plugin : ./IPythonCocoaFrontendLoader.py\
./setup.py