diff options
| author |  Jonathan Beck | 2009-03-16 21:40:33 +0100 |
|---|---|---|
| committer | Jonathan Beck | 2009-03-16 21:40:33 +0100 |
| commit | 19992c668afeb53a28e08a1f61572b5379f87590 (patch) | |
| tree | 4f1784b81afe88a6240889961b5fc3d2b0d6a82e /Makefile.am | |
| parent | 0d05f8de79ee91e9be80c6296eff9ce216582ba4 (diff) | |
| parent | 201e1ff5bf2054fcb1c0cc3cd7ba1e229dbde3fa (diff) | |
| download | libimobiledevice-19992c668afeb53a28e08a1f61572b5379f87590.tar.gz libimobiledevice-19992c668afeb53a28e08a1f61572b5379f87590.tar.bz2 | |
Merge branch 'master' into contact_sync
Conflicts:
configure.ac
dev/Makefile.am
include/libiphone/libiphone.h
src/AFC.c
src/AFC.h
src/Makefile.am
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions