Merge git://repo.or.cz/portableproplib
commite0663fc1dcc9672959b46072c9e8d926d297bc0e
authorJuan RP <xtraeme@gmail.com>
Fri, 14 Jan 2011 17:20:30 +0000 (14 18:20 +0100)
committerJuan RP <xtraeme@gmail.com>
Fri, 14 Jan 2011 17:20:30 +0000 (14 18:20 +0100)
treecc2c5422f49581ae0054c8ad5e32e84edb3a347b
parentbad5ceda6c15f987fe9f6e7f2fb6deeb3508754f
parent39a9408f557fba17badf1f00a2f876e8d5faa78a
Merge git://repo.or.cz/portableproplib

Conflicts:
AUTHORS
INSTALL
Makefile.am
NEWS
README
bootstrap
configure.ac
include/Makefile.am
man/Makefile.am
man/prop_array.3
man/prop_data.3
man/prop_dictionary.3
man/prop_ingest.3
man/prop_string.3
man/proplib.3
src/Makefile.am
src/prop_array.c
src/prop_array_util.c
src/prop_bool.c
src/prop_data.c
src/prop_dictionary.c
src/prop_dictionary_util.c
src/prop_ingest.c
src/prop_number.c
src/prop_object.c
src/prop_object_impl.h
src/prop_rb_impl.h
src/prop_stack.h
src/prop_string.c
man/proplib.3
src/prop_number.c