/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/serializer.py

  • Committer: John Arbash Meinel
  • Date: 2011-08-30 10:54:28 UTC
  • mfrom: (5609.48.9 2.3)
  • mto: (6015.28.2 2.4)
  • mto: This revision was merged to the branch mainline in revision 6124.
  • Revision ID: john@arbash-meinel.com-20110830105428-3xu4hkvizhfj5k11
Merge 2.3 into 2.4, and fix up the conflict for resolving bug #835035

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/serializer.py
93
93
 
94
94
 
95
95
format_registry = SerializerRegistry()
96
 
format_registry.register_lazy('4', 'bzrlib.xml4', 'serializer_v4')
97
96
format_registry.register_lazy('5', 'bzrlib.xml5', 'serializer_v5')
98
97
format_registry.register_lazy('6', 'bzrlib.xml6', 'serializer_v6')
99
98
format_registry.register_lazy('7', 'bzrlib.xml7', 'serializer_v7')