[Pkg-haskell-commits] [package-plan] 04/06: Merge branch 'new-shakespeare' into new-leksah

[Joachim Breitner]

This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to branch new-leksah
in repository package-plan.

commit fd59c8838c8cc6771f8f53ba3276bad8d2c634d1
Merge: 30dd73f f62cca3
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Fri Sep 12 16:08:34 2014 +0200

    Merge branch 'new-shakespeare' into new-leksah
    
    Conflicts:
    	packages.txt

 packages.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --cc packages.txt
index 810e596,ca5b57f..70770ed
--- a/packages.txt
+++ b/packages.txt
@@@ -245,16 -245,16 +245,16 @@@ graceful 0.1.1.
  graphviz 2999.17.0.1
  groups 0.4.0.0
  gsasl 0.3.5
 -gstreamer 0.12.1.2
 -gtk 0.12.5.6
 -gtk2hs-buildtools 0.12.5.2 binary
 -gtk3 0.12.5.6
 -gtkglext 0.12.1
 -gtksourceview2 0.12.3.1
 -gtk-traymanager 0.1.3
 +gstreamer 0.12.1.2 obsolete
 +gtk 0.13.0.0
 +gtk2hs-buildtools 0.13.0.1 binary
 +gtk3 0.13.0.0
 +gtkglext 0.12.1 obsolete
 +gtksourceview2 0.13.0.0
 +gtk-traymanager 0.1.5
  haddock 2.13.1
  hakyll 4.5.3.0 group=new-binary
- hamlet 1.1.9.2
+ hamlet 1.2.0 # needs to be obsoleted
  happstack 7.0.2
  happstack-authenticate 0.10.12
  happstack-heist 7.2.3

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git