|
|
@@ -1,7 +1,7 @@
|
|
|
apt (0.6.43ubuntu2) dapper; urgency=low
|
|
|
|
|
|
- * merged some missing bits that where dropped by the previous
|
|
|
- merge (*cough*)
|
|
|
+ * merged some missing bits that wheren't merged by baz in the previous
|
|
|
+ upload (*grumble*)
|
|
|
|
|
|
-- Michael Vogt <michael.vogt@ubuntu.com> Thu, 8 Dec 2005 18:35:58 +0100
|
|
|
|
|
|
@@ -29,8 +29,7 @@ apt (0.6.43) unstable; urgency=medium
|
|
|
* Fix GNU/kFreeBSD crash on non-existing server file (closes: #317718)
|
|
|
* switch to libdb4.3 in build-depends
|
|
|
|
|
|
-<<<<<<< TREE
|
|
|
- -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 25 Nov 2005 11:22:31 +0100
|
|
|
+ -- Michael Vogt <mvo@debian.org> Tue, 29 Nov 2005 00:17:07 +0100
|
|
|
|
|
|
apt (0.6.42.3ubuntu2) dapper; urgency=low
|
|
|
|
|
|
@@ -47,9 +46,6 @@ apt (0.6.42.3ubuntu1) dapper; urgency=low
|
|
|
* synced with debian
|
|
|
|
|
|
-- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Nov 2005 05:05:56 +0100
|
|
|
-=======
|
|
|
- -- Michael Vogt <mvo@debian.org> Tue, 29 Nov 2005 00:17:07 +0100
|
|
|
->>>>>>> MERGE-SOURCE
|
|
|
|
|
|
apt (0.6.42.3) unstable; urgency=low
|
|
|
|
Michael Vogt