Changeset [5514a3b2a9734d311e4f6014585f922e0b748cab] by Jonathan Beck
Revision 5514a3b2a9734d311e4f6014585f922e0b748cab,
committed by Jonathan Beck
· January 4th, 2009 @ 09:21 PM
Merge branch 'master' into plist
Conflicts:
src/AFC.c
src/lockdown.c
src/lockdown.h
src/plist.c
src/plist.h
9 changed files
-
M
src/AFC.c -
M
src/initconf.c -
M
src/iphone.c -
M
src/lockdown.c -
M
src/lockdown.h -
M
src/usbmux.c -
M
src/usbmux.h -
M
src/userpref.c -
M
src/userpref.h