3 Commits

Author	SHA1	Message	Date
Petri Lehtinen	5b88cc5ded	Merge branch '2.6'	2014-04-30 12:06:03 +03:00
Petri Lehtinen	17ec22f514	Merge branch '2.6'	2014-02-11 14:49:15 +02:00
Joakim Soderberg	3fe8f74e7f	Renamed config.h -> jansson_private_config.h ... This is because it's really easy to get a name collission if compiling Jansson as a subproject in a larger CMake project. If one project includes several subprojects each having their own config.h, this will cause the wrong file to be loaded.	2014-01-27 12:48:52 +01:00