[commit: packages/deepseq] master: Changelog for #10 (e153c1e)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/deepseq

On branch  : master
Link       : http://git.haskell.org/packages/deepseq.git/commitdiff/e153c1eeb7499f378a5e762b90bb635d89283abb

>---------------------------------------------------------------

commit e153c1eeb7499f378a5e762b90bb635d89283abb
Author: Eric Mertens <emertens at gmail.com>
Date:   Mon Oct 12 23:20:08 2015 -0700

    Changelog for #10


>---------------------------------------------------------------

e153c1eeb7499f378a5e762b90bb635d89283abb
 Control/DeepSeq.hs | 4 ++--
 changelog.md       | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Control/DeepSeq.hs b/Control/DeepSeq.hs
index 0b87c2e..bcd5efc 100644
--- a/Control/DeepSeq.hs
+++ b/Control/DeepSeq.hs
@@ -424,10 +424,10 @@ instance NFData Fingerprint where
 ----------------------------------------------------------------------------
 -- Foreign.Ptr
 
--- |/Since: 1.4.3.0/
+-- |/Since: 1.4.2.0/
 instance NFData (Ptr a) where rnf !_ = ()
 
--- |/Since: 1.4.3.0/
+-- |/Since: 1.4.2.0/
 instance NFData (FunPtr a) where rnf !_ = ()
 
 ----------------------------------------------------------------------------
diff --git a/changelog.md b/changelog.md
index 977a4d7..a700165 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,10 @@
 # Changelog for [`deepseq` package](http://hackage.haskell.org/package/deepseq)
 
+## 1.4.2.0  *Oct 2015*
+
+  * Added instances for `Ptr` and `FunPtr`
+    ([#10](https://github.com/haskell/deepseq/pull/10))
+
 ## 1.4.1.2  *Aug 2015*
 
   * Avoid the broken combination of GHC-7.2 with `array>=0.4`