← Back to branch summary

~openerp/openobject-server/trunk-speedup-need_action-tde

« back to all changes in this revision

Viewing changes to bin/addons/base/base_data.xml

  • Committer: Harry (Open ERP)
  • Author(s): xrg
  • Date: 2009-11-20 14:31:04 UTC
  • mfrom: (1119.1.208)
  • mto: (1898.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 1900.
  • Revision ID: hmo@tinyerp.com-20091120143104-tb6136unkdw7yfy9
[merge] merge from lp:~xrg/openobject-server/optimize-5.0 and removed some confilts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/addons/base/base_data.xml
574
574
            <field name="code">mh</field>
575
575
        </record>
576
576
        <record id="mk" model="res.country">
577
 
            <field name="name">Macedonia</field>
 
577
            <field name="name">FYROM</field>
578
578
            <field name="code">mk</field>
579
579
        </record>
580
580
        <record id="ml" model="res.country">