This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "snap".
The branch, master has been updated
via 60b838be8aa05d176f2fff5b5a0c2dc7d946c38b (commit)
via 879ccb603b7197e6a934be11a8ae739f0d109008 (commit)
via 2190658855219af53a6089bb9ec7f7749f5414e0 (commit)
via ae53d25445f5a42b8291f40041d237c08f8703c8 (commit)
from d0003bfaf1ec7199da9029cd60516e59927625b7 (commit)
Summary of changes:
snap.cabal | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 60b838be8aa05d176f2fff5b5a0c2dc7d946c38b
Merge: 879ccb6 d0003bf
Author: Gregory Collins <[email protected]>
Date: Sat Jan 15 13:37:38 2011 +0100
Merge branch 'master' of git.snapframework.com:snap
commit 879ccb603b7197e6a934be11a8ae739f0d109008
Merge: ead5e96 2190658
Author: Gregory Collins <[email protected]>
Date: Sat Jan 15 13:37:12 2011 +0100
Merge branch '0.3-stable'
diff --cc snap.cabal
index 0c8ebd4,3bf40a0..1ae1c2a
--- a/snap.cabal
+++ b/snap.cabal
@@@ -54,7 -51,7 +54,11 @@@ Librar
enumerator == 0.4.*,
filepath >= 1.1 && <1.3,
MonadCatchIO-transformers >= 0.2.1 && < 0.3,
++<<<<<<< HEAD
+ snap-core == 0.4.*,
++=======
+ snap-core >= 0.3.1 && <0.4,
++>>>>>>> 2190658855219af53a6089bb9ec7f7749f5414e0
heist >= 0.4 && < 0.5,
hint >= 0.3.3.1 && < 0.4,
template-haskell >= 2.3 && < 2.6,
-----------------------------------------------------------------------
hooks/post-receive
--
snap
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
