[Pkg-ocaml-maint-commits] r6016 - /trunk/packages/ocamlmakefile/trunk/debian/changelog

[treinen at users.alioth.debian.org]

Author: treinen
Date: Thu Oct 23 18:17:11 2008
New Revision: 6016

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=6016
Log:
resolve conflict

Modified:
    trunk/packages/ocamlmakefile/trunk/debian/changelog

Modified: trunk/packages/ocamlmakefile/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlmakefile/trunk/debian/changelog?rev=6016&op=diff
==============================================================================
--- trunk/packages/ocamlmakefile/trunk/debian/changelog (original)
+++ trunk/packages/ocamlmakefile/trunk/debian/changelog Thu Oct 23 18:17:11 2008
@@ -1,10 +1,16 @@
 ocamlmakefile (6.28.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ralf Treinen <treinen at debian.org>  Thu, 23 Oct 2008 20:11:27 +0200
+
+ocamlmakefile (6.28.1-1) unstable; urgency=low
 
   * New upstream release.
   * debian/control: added Homepage field
   * Standards-version 3.8.0 (no change)
 
- -- Ralf Treinen <treinen at debian.org>  Thu, 23 Oct 2008 19:57:43 +0200
+ -- Ralf Treinen <treinen at debian.org>  Wed, 20 Aug 2008 22:28:45 +0200
 
 ocamlmakefile (6.28.0-1) unstable; urgency=low