projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
65c70b8
bc0d066
)
[MERGE] from upstream
author
Frédéric van der Essen
<fva@openerp.com>
Tue, 17 Sep 2013 10:19:10 +0000
(12:19 +0200)
committer
Frédéric van der Essen
<fva@openerp.com>
Tue, 17 Sep 2013 10:19:10 +0000
(12:19 +0200)
bzr revid: fva@openerp.com-
20130917101910
-4h2g2njs2e9toc36
1
2
addons/point_of_sale/static/src/css/pos.css
patch
|
diff1
|
diff2
|
blob
|
history
addons/point_of_sale/static/src/js/models.js
patch
|
diff1
|
diff2
|
blob
|
history
addons/point_of_sale/static/src/js/screens.js
patch
|
diff1
|
diff2
|
blob
|
history
addons/point_of_sale/static/src/js/widgets.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/point_of_sale/static/src/css/pos.css
Simple merge
diff --cc
addons/point_of_sale/static/src/js/models.js
Simple merge
diff --cc
addons/point_of_sale/static/src/js/screens.js
Simple merge
diff --cc
addons/point_of_sale/static/src/js/widgets.js
Simple merge
projects / odoo / odoo.git / commitdiff