diff options
| author | rillig <rillig@pkgsrc.org> | 2005-11-09 23:53:28 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-11-09 23:53:28 +0000 |
| commit | d0b7b9ada87395e6d2534269807528f3d5e88ba0 (patch) | |
| tree | 253a9d5f0b255dd12e895fb85513bca6c9216a32 /audio/csound4 | |
| parent | 0b6c27a0cb073260fc3909ab8ebb310854ccb2c0 (diff) | |
| download | pkgsrc-d0b7b9ada87395e6d2534269807528f3d5e88ba0.tar.gz | |
Removed CVS conflict lines. Please use pkglint before committing changes.
Diffstat (limited to 'audio/csound4')
| -rw-r--r-- | audio/csound4/distinfo | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/audio/csound4/distinfo b/audio/csound4/distinfo index 94e75f2f859..53f0bd73e75 100644 --- a/audio/csound4/distinfo +++ b/audio/csound4/distinfo @@ -1,11 +1,8 @@ -$NetBSD: distinfo,v 1.6 2005/11/09 06:35:25 ben Exp $ +$NetBSD: distinfo,v 1.7 2005/11/09 23:53:28 rillig Exp $ SHA1 (csound/csound-4.23f13gbs.0.tar.gz) = 2f86efb6e53f43cd16a6cfb0ff9a0786982f7af9 RMD160 (csound/csound-4.23f13gbs.0.tar.gz) = 46e161975afbf68f5591842e2921ea1822df30b2 Size (csound/csound-4.23f13gbs.0.tar.gz) = 1676345 bytes -<<<<<<< distinfo -======= ->>>>>>> 1.5 SHA1 (patch-aa) = ec2b962f512bbb93aa6255dff0efa4d93aa035a8 SHA1 (patch-ab) = 49e1780581c8aecd4962e7f05d573671576cfe42 SHA1 (patch-ac) = ceafc26767ac533368875994a668b8118426d675 |