Merge branch 'master' of ssh://github.com/e-travel/msgpack

Conflicts: csharp/MsgPack/CompiledPacker.cs
msgpack · Nov 30, 2011 · c89e517 · c89e517
2 parents dbd2085 + f3a40b1
commit c89e517
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/csharp/MsgPack/CompiledPacker.cs b/csharp/MsgPack/CompiledPacker.cs
@@ -372,7 +372,7 @@ static MemberInfo[] LookupMembers (Type t)
 				BindingFlags baseFlags = BindingFlags.Instance | BindingFlags.Public;
 				List<MemberInfo> list = new List<MemberInfo> ();
 				list.AddRange (t.GetFields (baseFlags));
-                list.AddRange( t.GetProperties(baseFlags));
+				list.AddRange( t.GetProperties(baseFlags));
 				// TODO: Add NonSerialized Attribute Filter ?
 				return list.ToArray ();
 			}

diff --git a/haskell/msgpack.cabal b/haskell/msgpack.cabal
@@ -1,5 +1,5 @@
 Name:               msgpack
-Version:            0.6.1.2
+Version:            0.6.1.3
 Synopsis:           A Haskell implementation of MessagePack
 Description:
   A Haskell implementation of MessagePack <http://msgpack.org/>
@@ -28,8 +28,8 @@ Library
                     attoparsec >= 0.8 && < 0.10,
                     binary >= 0.5.0 && < 0.5.1,
                     data-binary-ieee754 >= 0.4 && < 0.5,
-                    deepseq >= 1.1 && <1.2,
-                    template-haskell >= 2.4 && < 2.6
+                    deepseq >= 1.1 && <1.3,
+                    template-haskell >= 2.4 && < 2.7
 
   Ghc-options:      -Wall
   Hs-source-dirs:   src