aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2013-04-02Merge pull request #108 from Zillode/1edff47af38a2335f88300ee6dc437118f5a20ffPetri Lehtinen4-0/+11
2013-04-01Merge branch '2.4'Petri Lehtinen1-1/+1
2013-04-01Fix a typoPetri Lehtinen1-1/+1
2013-03-27Create Android.mk, preconfigured jansson_config.h and CleanSpec.mk for Androi...Garner Lee3-0/+117
2013-03-14Do not define _GNU_SOURCE is already definedLode Hoste4-0/+11
2013-03-14Fix a refleak in test/bin/json_process.cPetri Lehtinen1-0/+1
2013-03-14Remove trailing whitespacePetri Lehtinen2-44/+44
2013-03-14cmake: Add stripped testsPetri Lehtinen1-0/+4
2013-03-14Merge branch 'rebased_cmake_patch' of git://github.com/JoakimSoderberg/janssonPetri Lehtinen17-44/+781
2013-03-13Got rid of some warnings for unused variables.Joakim Söderberg1-6/+6
2013-03-13Add back the old ENV variabe approach to json_process.Joakim Söderberg6-19/+141
2013-03-09Merge branch '2.4'Petri Lehtinen2-0/+9
2013-03-09Use json_decref() properly in tutorialPetri Lehtinen2-0/+9
2013-03-07Moved *config.h.cmake to the cmake directory.Joakim Soderberg3-2/+2
2013-03-07Get rid of type warning on MSVC.Joakim Soderberg1-1/+1
2013-03-07Skip using a debug postfix with visual studio.Joakim Soderberg1-4/+0
2013-03-07Compile tests by default.Joakim Söderberg2-38/+52
2013-03-07Fix incorrect cast to ssize_t.Joakim Söderberg1-1/+0
2013-03-07Rename the CMakeModules directory to simply cmake.Joakim Söderberg2-0/+0
2013-03-07Always use LF as line ending so that we don't get any problems with lineJoakim Soderberg1-0/+2
2013-03-07Consolidated the CMake project.Joakim Soderberg6-132/+269
2013-03-07Fixes for cmake for MSVC2010Paul Harris2-4/+17
2013-03-07Add CMake build system.Paul Harris10-0/+454
2013-02-05Merge branch '2.4'Petri Lehtinen1-1/+1
2013-02-05check-exports test: Filter out symbols that start with an underscorePetri Lehtinen1-1/+1
2013-02-04Merge branch '2.4'Petri Lehtinen1-1/+1
2013-02-04Enable -Werror in Travis buildsPetri Lehtinen1-1/+1
2013-02-04Merge branch '2.4'Petri Lehtinen6-9/+7
2013-02-04Don't use -Werror by defaultPetri Lehtinen1-1/+1
2013-02-04Enable gcc specific flags in tests correctlyPetri Lehtinen6-9/+7
2013-01-06Compress bz2 doc tarballs with bzip2 instead of gzipPetri Lehtinen1-1/+3
2013-01-03Merge branch '2.4'Petri Lehtinen1-1/+1
2013-01-03Make it possible to forward declare struct json_tPetri Lehtinen1-1/+1
2012-12-28Merge branch '2.4'Petri Lehtinen1-4/+3
2012-12-28Add travis build status image more cleverlyPetri Lehtinen1-4/+3
2012-12-28Merge branch '2.4'Petri Lehtinen2-0/+6
2012-12-28Add travis build status to README.rstPetri Lehtinen1-0/+5
2012-12-28travis: Run "make check" instead of "make test"Petri Lehtinen1-1/+1
2012-12-28travis: Bootstrap autotools before buildingPetri Lehtinen1-0/+1
2012-12-28Merge branch '2.4'Petri Lehtinen1-1/+1
2012-12-28Fix // -> /* */Petri Lehtinen1-1/+1
2012-12-23Merge branch '2.4'Petri Lehtinen1-0/+4
2012-12-23Add Travis configurationPetri Lehtinen1-0/+4
2012-12-10Merge branch '2.4'Petri Lehtinen4-5/+5
2012-12-10Change const pointer to arrayJacob Potter1-1/+1
2012-12-10Mark some constant data as const.Jacob Potter3-4/+4
2012-12-10fixed l_isxdigit() macroAttie Grande1-1/+1
2012-12-04Merge branch '2.4'Petri Lehtinen2-3/+3
2012-12-04Really fix the off-by-one error in json_array_remove()Petri Lehtinen2-3/+3
2012-12-04Merge branch '2.4'Petri Lehtinen2-1/+18