diff options
| author |  Jonathan Beck | 2009-01-04 22:21:15 +0100 |
|---|---|---|
| committer | Jonathan Beck | 2009-01-04 22:21:15 +0100 |
| commit | 5514a3b2a9734d311e4f6014585f922e0b748cab (patch) | |
| tree | ca88a32519d6a07da72d15632de7af04461f7ba8 /Makefile.am | |
| parent | 4301ef9bb8e9d06ffa4e9172191d58ede5e16f5d (diff) | |
| parent | 5cde55426112a8cb79d809dae5f61e347c007212 (diff) | |
| download | libimobiledevice-5514a3b2a9734d311e4f6014585f922e0b748cab.tar.gz libimobiledevice-5514a3b2a9734d311e4f6014585f922e0b748cab.tar.bz2 | |
Merge branch 'master' into plist
Conflicts:
src/AFC.c
src/lockdown.c
src/lockdown.h
src/plist.c
src/plist.h
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions