diff options
| author |  Jonathan Beck | 2009-01-08 18:51:42 +0100 |
|---|---|---|
| committer | Jonathan Beck | 2009-01-08 18:51:42 +0100 |
| commit | f53b61c82be8aa6223ab6a524c2287d892f9864c (patch) | |
| tree | 99f67152a644ded15d0bd7cd16664c4eb1eb7c00 /tools/iphone_id.c | |
| parent | 5514a3b2a9734d311e4f6014585f922e0b748cab (diff) | |
| parent | ef98ef7211bc6277e9a87349f0405957ab264936 (diff) | |
| download | libimobiledevice-f53b61c82be8aa6223ab6a524c2287d892f9864c.tar.gz libimobiledevice-f53b61c82be8aa6223ab6a524c2287d892f9864c.tar.bz2 | |
Merge branch 'nikias' into plist
Conflicts:
src/lockdown.c
Diffstat (limited to 'tools/iphone_id.c')
0 files changed, 0 insertions, 0 deletions