diff options
author | Martin Szulecki | 2009-05-24 00:25:03 +0200 |
---|---|---|
committer | Martin Szulecki | 2009-05-24 00:25:03 +0200 |
commit | 36ea32e0064f33d6a285684c3069f4d75bbac7a8 (patch) | |
tree | 039291b47e954fe8529f52e1fc71f7e924761a6a /src/userpref.h | |
parent | 46f8d46845355e6a33a6dcb97ba11d4c4cab62eb (diff) | |
parent | 435f5feb4b5c501db52743a170908687d3ba6f60 (diff) | |
download | libimobiledevice-36ea32e0064f33d6a285684c3069f4d75bbac7a8.tar.gz libimobiledevice-36ea32e0064f33d6a285684c3069f4d75bbac7a8.tar.bz2 |
Merge branch 'master' of git://github.com/MattColyer/libiphone into martin
Conflicts:
src/Makefile.am
Diffstat (limited to 'src/userpref.h')
0 files changed, 0 insertions, 0 deletions