Merge remote-tracking branch 'gvdb/master'
commit8e04a32f9ead35e5c73148a529014076910dd3d1
authorRyan Lortie <desrt@desrt.ca>
Fri, 9 Nov 2012 18:19:59 +0000 (9 13:19 -0500)
committerRyan Lortie <desrt@desrt.ca>
Fri, 9 Nov 2012 18:19:59 +0000 (9 13:19 -0500)
tree7ac7db4f975012e207d63f018a4b0f36d6828de6
parent12395df3d35426e05231e8401bd03fdded6cb7ab
parent26000821510c66713feacb8b40c1ed5253195a53
Merge remote-tracking branch 'gvdb/master'
gvdb/gvdb-reader.c
gvdb/gvdb-reader.h