~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/user-guide/index-plain.txt

  • Committer: Andrew Bennetts
  • Date: 2010-03-11 04:33:41 UTC
  • mfrom: (4797.33.4 2.1)
  • mto: This revision was merged to the branch mainline in revision 5082.
  • Revision ID: andrew.bennetts@canonical.com-20100311043341-rzdik83fnactjsxs
Merge lp:bzr/2.1, including fixes for #496813, #526211, #526353.

Show diffs side-by-side

added added

removed removed

Lines of Context:
114
114
.. include:: setting_up_email.txt
115
115
.. include:: http_smart_server.txt
116
116
.. include:: writing_a_plugin.txt
117
 
.. include:: licence.txt
118
117
 
119
118
.. |--| unicode:: U+2014
120
119