← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/index-plain.txt
79
79
.. include:: part2_intro.txt
80
80
.. include:: adv_merging.txt
81
81
.. include:: shelving_changes.txt
 
82
.. include:: switch_store.txt
82
83
.. include:: filtered_views.txt
83
84
.. include:: stacked.txt
84
85
.. include:: server.txt
114
115
.. include:: setting_up_email.txt
115
116
.. include:: http_smart_server.txt
116
117
.. include:: writing_a_plugin.txt
 
118
.. include:: licence.txt
117
119
 
118
120
.. |--| unicode:: U+2014
119
121