projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
27ad104
927227c
)
[MERGE] merged dev-trunk-framework branch, including docstring improvements and a...
author
Olivier Dony
<odo@openerp.com>
Thu, 8 Apr 2010 10:55:37 +0000
(12:55 +0200)
committer
Olivier Dony
<odo@openerp.com>
Thu, 8 Apr 2010 10:55:37 +0000
(12:55 +0200)
bzr revid: odo@openerp.com-
20100408105537
-uy02ichkpw25bu3e
1
2
bin/osv/orm.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
bin/osv/orm.py
Simple merge