projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
881b93e
ffeff63
)
[MERGE]Merge with trunk upto revision no 855.
author
Kunal Chavda (OpenERP)
<kch@tinyerp.com>
Thu, 25 Aug 2011 05:44:08 +0000
(11:14 +0530)
committer
Kunal Chavda (OpenERP)
<kch@tinyerp.com>
Thu, 25 Aug 2011 05:44:08 +0000
(11:14 +0530)
bzr revid: kch@tinyerp.com-
20110825054408
-0b7063yvldh60u05
1
2
addons/base/static/src/js/chrome.js
patch
|
diff1
|
diff2
|
blob
|
history
addons/base/static/src/js/form.js
patch
|
diff1
|
diff2
|
blob
|
history
addons/base/static/src/js/views.js
patch
|
diff1
|
diff2
|
blob
|
history
addons/base/static/src/xml/base.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/base/static/src/js/chrome.js
Simple merge
diff --cc
addons/base/static/src/js/form.js
Simple merge
diff --cc
addons/base/static/src/js/views.js
Simple merge
diff --cc
addons/base/static/src/xml/base.xml
Simple merge