Permalink
Browse files

Merge branch 'master' of github.com:blampe/IbPy

Conflicts:
	Makefile
	ib/ext/Makefile
	ib/opt/sender.py
  • Loading branch information...
blampe committed Jul 24, 2012
2 parents e881469 + 74bfc55 commit 20ffc5bc49675c47bd2ac3241f31212183085465
Showing with 1 addition and 2 deletions.
  1. +1 −1 ib/ext/Makefile
  2. +0 −1 ib/opt/sender.py
View
@@ -24,7 +24,7 @@ src:
$(modules):
- j2py -i $(addprefix $(srcdir), $(addsuffix .java, $(basename $@))) -o $@ -c ib.ext.cfg -c ib.ext.cfg.$(basename $@)
+ j2py -i $(addprefix $(srcdir), $(addsuffix .java, $(basename $@))) -o $@ -c cfg -c cfg.$(basename $@) -s
modules-clean: clean-modules
clean-modules:
View
@@ -82,4 +82,3 @@ def wrapperMethod(*args):
self.dispatcher(postName, mapping)
return result # or results?
return wrapperMethod
-

0 comments on commit 20ffc5b

Please sign in to comment.