Changeset [85b8a301be39c4b86cb7f38e80c3cb592240ccb9] by Jonathan Beck
Revision 85b8a301be39c4b86cb7f38e80c3cb592240ccb9,
committed by Jonathan Beck
· March 24th, 2009 @ 07:58 PM
Merge branch 'master' of git://github.com/MattColyer/libiphone into contact_sync
Conflicts:
Makefile.am
configure.ac
src/AFC.h
src/NotificationProxy.c
src/lockdown.c
11 changed files
-
M
Makefile.am -
M
README -
M
configure.ac -
M
src/AFC.h -
M
src/MobileSync.c -
M
src/NotificationProxy.c -
M
src/lockdown.c -
M
src/lockdown.h -
M
udev/89-libiphone.rules.in -
M
udev/Makefile.am -
M
udev/set-usb-configuration-3.sh