← Back to branch summary

~manchicken/adept/updater-changelog-viewer

Viewing all changes in revision 19.

  • Committer: Development User
  • Date: 2007-02-14 03:47:56 UTC
  • Revision ID: devuser@larry-20070214034756-j3n6gc7wlhe6l0i3
Merging in from John Riddell's branch.  Command issued: bzr merge -r12..25 http://bazaar.launchpad.net/~jr/adept/ubuntu

Favored John's changes in the conflicts.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: