aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@redhat.com>2009-07-09 09:02:11 +0200
committerDaniel Veillard <veillard@redhat.com>2009-07-09 09:02:11 +0200
commit44af232c837312900f7d5c0ad58c2d52cdc8aa8f (patch)
treea74f4e85e151cbe6ef91464ed646c816797d8ae6 /test
parent4ab6755755686fc8298abc6eed2c5e3d590e5e33 (diff)
parent798743a4983d3a2c94d6af1608bce9696aa181e7 (diff)
downloadandroid_external_libxml2-44af232c837312900f7d5c0ad58c2d52cdc8aa8f.tar.gz
android_external_libxml2-44af232c837312900f7d5c0ad58c2d52cdc8aa8f.tar.bz2
android_external_libxml2-44af232c837312900f7d5c0ad58c2d52cdc8aa8f.zip
Fix ChangeLog merge conflict
Diffstat (limited to 'test')
0 files changed, 0 insertions, 0 deletions