diff options
| author | Mantavya Gajjar <mga@tinyerp.com> | 2008-11-27 21:06:46 +0530 |
|---|---|---|
| committer | Mantavya Gajjar <mga@tinyerp.com> | 2008-11-27 21:06:46 +0530 |
| commit | abde375bf85d47ed0e763d19cce273abb7346029 (patch) | |
| tree | 65ed7d2ff2a3e094d2770c1036e475c6b8dd7603 /addons/project/process/task_process.xml | |
| parent | 266cc51c25d0ca4844bed45eb637a261e493694f (diff) | |
| parent | f8618cfb191ebf91749394f5031bb97917782ba1 (diff) | |
merging from the trunk-addons
-------------This line and the following will be ignored --------------
modified:
wiki/__terp__.py
wiki/data/wiki_faq.xml
wiki/wiki.py
wiki/wiki_view.xml
pending merges:
Fabien Pinckaers 2008-11-27 modifs
Fabien Pinckaers 2008-11-27 merge
bzr revid: mga@tinyerp.com-20081127153646-xuhor3udmjifqy2j
Diffstat (limited to 'addons/project/process/task_process.xml')
0 files changed, 0 insertions, 0 deletions