projects / platform / upstream / json-c.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4154c55 a1221eb)
Merge pull request #26 from ford-prefect/master
authorEric Haszlakiewicz <erh+git@nimenees.com>
Mon, 9 Jul 2012 02:01:19 +0000 (19:01 -0700)
committerEric Haszlakiewicz <erh+git@nimenees.com>
Mon, 9 Jul 2012 02:01:19 +0000 (19:01 -0700)
Android build system

1  2 
Makefile.am patch | diff1 | diff2 | blob | history
configure.in patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
Simple merge
diff --cc configure.in
Simple merge
Domain: System / Base;