summaryrefslogtreecommitdiffstats
path: root/udev
diff options
context:
space:
mode:
authorGravatar Jonathan Beck2009-01-08 18:51:42 +0100
committerGravatar Jonathan Beck2009-01-08 18:51:42 +0100
commitf53b61c82be8aa6223ab6a524c2287d892f9864c (patch)
tree99f67152a644ded15d0bd7cd16664c4eb1eb7c00 /udev
parent5514a3b2a9734d311e4f6014585f922e0b748cab (diff)
parentef98ef7211bc6277e9a87349f0405957ab264936 (diff)
downloadlibimobiledevice-f53b61c82be8aa6223ab6a524c2287d892f9864c.tar.gz
libimobiledevice-f53b61c82be8aa6223ab6a524c2287d892f9864c.tar.bz2
Merge branch 'nikias' into plist
Conflicts: src/lockdown.c
Diffstat (limited to 'udev')
0 files changed, 0 insertions, 0 deletions