diff options
author | Martin Szulecki | 2009-08-04 19:07:47 +0200 |
---|---|---|
committer | Martin Szulecki | 2009-08-04 19:07:47 +0200 |
commit | 74ba34bb0554f581f408ebadd25bbc203b24b4aa (patch) | |
tree | d3fe143d8e96646f04457d85ad90e018f7a31a33 /dev | |
parent | 3b3a47b798b80c78446d9f062d311bcca135b177 (diff) | |
parent | 84620d89f988b0b763daea1f4ccae66acc062b19 (diff) | |
download | libimobiledevice-74ba34bb0554f581f408ebadd25bbc203b24b4aa.tar.gz libimobiledevice-74ba34bb0554f581f408ebadd25bbc203b24b4aa.tar.bz2 |
Merge branch 'master' of git://github.com/MattColyer/libiphone into martin
Conflicts:
dev/Makefile.am
Diffstat (limited to 'dev')
0 files changed, 0 insertions, 0 deletions