[Pkg-haskell-commits] darcs: ftphs: Conflict resolution

[John Goerzen]

Wed Apr  5 19:22:52 UTC 2006  John Goerzen <jgoerzen at complete.org>
  * Conflict resolution
  Ignore-this: d397fd1a427961dd29587ca5b101d148
  

    M ./changelog +23

Wed Apr  5 19:22:52 UTC 2006  John Goerzen <jgoerzen at complete.org>
  * Conflict resolution
  Ignore-this: d397fd1a427961dd29587ca5b101d148
  
diff -rN -u old-ftphs//changelog new-ftphs//changelog
--- old-ftphs//changelog	2013-01-04 14:24:09.387718002 +0000
+++ new-ftphs//changelog	2013-01-04 14:24:10.891719488 +0000
@@ -1,3 +1,26 @@
+missingh (0.13.2) unstable; urgency=low
+
+  * New function splitWs
+
+ -- John Goerzen <jgoerzen at complete.org>  Tue,  4 Apr 2006 05:31:15 -0500
+
+missingh (0.13.1) unstable; urgency=low
+
+  * Note Build-Depends on HUnit in MissingH.Cabal.  Closes: #356196.
+  * MissingH.IO.HVIO: No longer return EOFError when vGetContents called
+    at EOF, for compatibility with hGetContents.  Reported by
+    Bulat Ziganshin.
+  * MissingH.IO.HVFS.Utils: Applied suggestion from Bulat
+    to make recursiveRemove cleaner.
+  * MissingH.IO.HVIO: Minor bugfixes suggested by Bulat.
+  * Updated, fixed typos, and enhanced various docs.
+  * testsrc/Listtest: Added unit tests for spanList
+  * MissingH.List: Replaced implementation of spanList with one
+    suggested by Bulat.
+  * Added ghc6 (>= 6.4.1) to Debian build-depends.
+
+ -- John Goerzen <jgoerzen at complete.org>  Sat, 11 Mar 2006 12:26:03 -0600
+
 missingh (0.13.0) unstable; urgency=low
 
   * This release introduces some API changes that will affect