← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzr

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-05-13 19:59:32 UTC
  • mfrom: (5853.1.4 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20110513195932-upsvlswzyvwodep0
(vila) Merge 2.3 into trunk resolving conflicts (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzr
1
1
#! /usr/bin/env python
2
2
 
3
 
# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Canonical Ltd
 
3
# Copyright (C) 2005-2011 Canonical Ltd
4
4
#
5
5
# This program is free software; you can redistribute it and/or modify
6
6
# it under the terms of the GNU General Public License as published by