← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/developers/index.txt

  • Committer: John Arbash Meinel
  • Date: 2009-09-02 13:32:52 UTC
  • mfrom: (4634.6.14 2.0)
  • mto: (4634.6.15 2.0)
  • mto: This revision was merged to the branch mainline in revision 4667.
  • Revision ID: john@arbash-meinel.com-20090902133252-t2t94xtckoliv2th
Merge lp:bzr/2.0 to resolve NEWS issues.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/developers/index.txt
126
126
* `Computing last_modified values <last-modified.html>`_ for inventory
127
127
  entries
128
128
 
 
129
* `Content filtering <content-filtering.html>`_
 
130
 
129
131
* `LCA Tree Merging <lca_tree_merging.html>`_ |--| Merging tree-shape when
130
132
  there is not a single unique ancestor (criss-cross merge).
131
133