~bzr-pqm/bzr/bzr.dev

  • Committer: Andrew Bennetts
  • Date: 2009-10-26 06:44:40 UTC
  • mfrom: (4634.77.9 2.0)
  • Revision ID: andrew.bennetts@canonical.com-20091026064440-06u7tpg7l6sjkh8h
Merge lp:bzr/2.0 into lp:bzr.
Filename Latest Rev Last Changed Committer Comment Size
..
__init__.py 4711.2.2 15 years ago John Arbash Meinel Bring in bzr.dev 4748, resolve conflict, update NE 9.2 KB Diff Download File
text.py 4711.1.8 15 years ago Martin Pool Add show_warning and show_message tests and implem 13.2 KB Diff Download File