Conflicts resolving in process module
authorRucha Patel <ruchakpatel@gmail.com>
Tue, 23 Sep 2008 09:22:02 +0000 (14:52 +0530)
committerRucha Patel <ruchakpatel@gmail.com>
Tue, 23 Sep 2008 09:22:02 +0000 (14:52 +0530)
commit51fedfff04329f97e7138d00f8de30c30a030b80
tree59107d42658e737ea5815a13473e1afc487de12a
parent428dafdf5f77cf2a94772be763b86e2ff437b3f5
Conflicts resolving in process module

bzr revid: ruchakpatel@gmail.com-20080923092202-hb2g2q37d5ikcvxw
addons/process/process.py
addons/process/process_demo.xml
addons/process/process_view.xml