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-server".
The branch, master has been updated
via 7132ac054c8bc810c631a7226426bde910ce663a (commit)
via 0e5a1fdd42c7faed02a31e3d125ac9df3e85836a (commit)
via 6417ac3a8af837337a99c861b88d96b5d2651d65 (commit)
via 73de4d174a75a844f4cfd08f60bbdebe8abf95dc (commit)
via ef62d58008999e1db974faf26a64f0832400bdf2 (commit)
from 22fa0969e3ee00144f451da0f21f647307252be1 (commit)
Summary of changes:
snap-server.cabal | 2 +-
test/snap-server-testsuite.cabal | 6 +++---
2 files changed, 4 insertions(+), 4 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 7132ac054c8bc810c631a7226426bde910ce663a
Merge: 0e5a1fd 22fa096
Author: Gregory Collins <[email protected]>
Date: Sun Nov 7 15:24:47 2010 +0100
Merge branch 'master' of git.snapframework.com:snap-server
commit 0e5a1fdd42c7faed02a31e3d125ac9df3e85836a
Merge: 04aab67 6417ac3
Author: Gregory Collins <[email protected]>
Date: Sun Nov 7 15:24:22 2010 +0100
Merge branch '0.2-stable'
diff --cc snap-server.cabal
index 60230df,7da3160..cff0183
--- a/snap-server.cabal
+++ b/snap-server.cabal
@@@ -119,8 -119,7 +119,8 @@@ Librar
dlist >= 0.5 && < 0.6,
filepath,
iteratee >= 0.3.1 && <0.4,
+ MonadCatchIO-transformers >= 0.2.1 && < 0.3,
- monads-fd,
+ monads-fd < 0.1.0.3,
murmur-hash >= 0.1 && < 0.2,
network == 2.2.1.*,
old-locale,
-----------------------------------------------------------------------
hooks/post-receive
--
snap-server
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
