Merge branch 'bugfixes' into 3.1

Warzone2100 · Jul 13, 2012 · aa676c1 · aa676c1
2 parents e370f0f + d2a8a13
commit aa676c1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/framework/treap.cpp b/lib/framework/treap.cpp
@@ -222,7 +222,7 @@ static const char* treapFindKeyRec(TREAP_NODE const * const psNode, const char *
 		return key;
 	}
 
-	return treapFindKeyRec(psNode->psLeft, string);
+	return treapFindKeyRec(psNode->psRight, string);
 }
 
 const char* treapFindKey(TREAP_NODE** psTreap, const char* string)

diff --git a/macosx/configs/fetchscripts/Png-FetchSource.sh b/macosx/configs/fetchscripts/Png-FetchSource.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-VerLib="1.5.11"
+VerLib="1.5.12"
 OutDir="libpng"
 DirectorY="${OutDir}-${VerLib}"
 FileName="${DirectorY}.tar.gz"
 SourceDLP="http://downloads.sourceforge.net/project/libpng/libpng15/${VerLib}/${FileName}"
-MD5Sum="7373f65ca1407ce9910d634e527e8959"
+MD5Sum="8ea7f60347a306c5faf70b977fa80e28"
 
 configs/FetchSource.sh "${DirectorY}" "${OutDir}" "${FileName}" "${SourceDLP}" "${MD5Sum}"
 exit ${?}