Changeset [c1b2004461aaf2912af749620e7504345bf409ba] by Jonathan Beck
Revision c1b2004461aaf2912af749620e7504345bf409ba,
committed by Jonathan Beck
· January 29th, 2009 @ 05:02 PM
Merge branch 'master' into contact_sync
Conflicts:
src/Makefile.am
src/iphone.c
src/lockdown.c
src/lockdown.h
src/utils.c
9 changed files
-
M
AUTHORS -
M
README -
M
include/libiphone/libiphone.h -
M
src/AFC.c -
M
src/Makefile.am -
M
src/iphone.c -
M
src/lockdown.c -
M
src/lockdown.h -
M
src/utils.c