[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-lib [import]

[Jordi Mallach]

--oyUTqETQ0mS9luUI
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Wed, Jun 09, 2004 at 10:40:22AM -0600, Jordi Mallach wrote:
> U debian/alsa-lib/COPYING

I dunno what the fuck this is, but it's obvious I fucked up.

David, should we tell wiggy to clean this removing the bogus dir
entirely?

David, I think I need the howto again. Following the instructions in the
screen was too dangerous.

> 4 conflicts created by this import.
> Use the following command to help the merge:
>=20
> 	cvs checkout -jsource-dist:yesterday -jsource-dist debian/alsa-lib

This command was quite destructive.

--=20
Jordi Mallach P=E9rez  --  Debian developer     http://www.debian.org/
jordi@sindominio.net     jordi@debian.org     http://www.sindominio.net/
GnuPG public key information available at http://oskuro.net/~jordi/

--oyUTqETQ0mS9luUI
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFAx0DoJYSUupF6Il4RAvpOAJ4g1s1E3Zsq5YSoduL5WHUayEZ2xACdFGzn
ghKHxMkFDkritMoRdtqZkG0=
=196Q
-----END PGP SIGNATURE-----

--oyUTqETQ0mS9luUI--