Merge branch 'upstream' master-0.15
authorSteven Noonan <steven@uplinklabs.net>
Mon, 9 May 2011 04:15:28 +0000 (21:15 -0700)
committerSteven Noonan <steven@uplinklabs.net>
Mon, 9 May 2011 04:15:28 +0000 (21:15 -0700)
commit1badaca868976259ab2dbfa355fdf4bbc8d68f76
tree77e4cff946d2ad03e4540a6830f485645c9641af
parent061c5bcc0366d5609a774b2da99d5290ead633b5
parentc581d7f8035d060f8d7010ac4fb752f77aeb7b08
Merge branch 'upstream'

Conflicts:
CMakeLists.txt
projects/xcode/libpng.xcodeproj/project.pbxproj

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
projects/xcode/Info.plist
projects/xcode/libpng.xcodeproj/project.pbxproj