projects / profile / ivi / jansson.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c2ca3f 38950b0)
Merge branch 'c++-api'
authorPetri Lehtinen <petri@digip.org>
Thu, 21 Jan 2010 20:29:26 +0000 (22:29 +0200)
committerPetri Lehtinen <petri@digip.org>
Thu, 21 Jan 2010 20:29:26 +0000 (22:29 +0200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/Makefile.am patch | diff1 | diff2 | blob | history
test/suites/api/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc test/suites/api/Makefile.am
Simple merge
Domain: System / Base;