- Committer: Canonical.com Patch Queue Manager
- Date: 2010-09-15 10:09:07 UTC
- mfrom: (5050.34.1 prepare-2.2)
- mto: (5430.1.1 merge-2.2-into-devel) (5432.3.1 prepare-2.3b1) (5050.44.1 2.2.2-dev) (5439.1.1 merge-2.2-into-devel) (5447.1.1 trunk) (5473.1.1 trunk) (5540.4.1 checkout-tags-propagation-603395-2.3) (4597.12.2 646961-fix) (5523.1.1 trunk) (5530.1.1 trunk) (5535.1.1 merge-2.2-into-devel) (5551.1.1 trunk) (5552.1.1 583667-lp-no-edge-2.3) (5554.1.3 trunk) (5573.1.1 merge_2.2_to_dev) (5579.1.1 693880-ssl-readline) (5609.6.1 2.3.0-dev) (6024.3.1 integration) (6012.1.1 trunk) (4797.94.3 2.2-feature-flags)
- Revision ID: pqm@pqm.ubuntu.com-20100915100907-icd1mnify8zwgiw8
(mbp) Merge up 2.1 to 2.2, fixing bug 254278 (Martin Pool)
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
conflict-types.txt |
4597.6.3 | 14 years ago | Vincent Ladeuil | Merge cleanup into description | 7.2 KB |
|
|