merge

author fp <fp@fp-laptop>

Sat, 17 Sep 2011 17:24:05 +0000 (19:24 +0200)

committer fp <fp@fp-laptop>

Sat, 17 Sep 2011 17:24:05 +0000 (19:24 +0200)
author fp <fp@fp-laptop>
Sat, 17 Sep 2011 17:24:05 +0000 (19:24 +0200)
committer fp <fp@fp-laptop>
Sat, 17 Sep 2011 17:24:05 +0000 (19:24 +0200)
diff --cc addons/mrp/report/mrp_production_order_view.xml
Simple merge
diff --cc addons/mrp_operations/mrp_operations_view.xml
Simple merge
diff --cc addons/mrp_operations/report/mrp_workorder_analysis_view.xml
Simple merge
		1	2
addons/mrp/report/mrp_production_order_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/mrp_operations/mrp_operations_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/mrp_operations/report/mrp_workorder_analysis_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history