Changeset [19992c668afeb53a28e08a1f61572b5379f87590] by Jonathan Beck
Revision 19992c668afeb53a28e08a1f61572b5379f87590,
committed by Jonathan Beck
· March 16th, 2009 @ 08:40 PM
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
11 changed files
-
M
configure.ac -
M
dev/Makefile.am -
M
dev/main.c -
M
fdi/31-apple-mobile-device.fdi -
M
include/libiphone/libiphone.h -
M
src/AFC.c -
M
src/AFC.h -
M
src/Makefile.am -
M
src/NotificationProxy.c -
M
src/NotificationProxy.h -
M
src/usbmux.c