diff options
| author |  Jonathan Beck | 2009-01-29 18:02:04 +0100 |
|---|---|---|
| committer | Jonathan Beck | 2009-01-29 18:02:04 +0100 |
| commit | c1b2004461aaf2912af749620e7504345bf409ba (patch) | |
| tree | 2c238a2d8c1598265a07a2fd52beec0939d08a73 /dev | |
| parent | 0934d1ac021dfb7907e4b580b38aa4a938cf2180 (diff) | |
| parent | f7fbac7803c5cb5934aab58925babc70af4ab848 (diff) | |
| download | libimobiledevice-c1b2004461aaf2912af749620e7504345bf409ba.tar.gz libimobiledevice-c1b2004461aaf2912af749620e7504345bf409ba.tar.bz2 | |
Merge branch 'master' into contact_sync
Conflicts:
src/Makefile.am
src/iphone.c
src/lockdown.c
src/lockdown.h
src/utils.c
Diffstat (limited to 'dev')
0 files changed, 0 insertions, 0 deletions