summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2009-08-04 19:07:47 +0200
committerGravatar Martin Szulecki2009-08-04 19:07:47 +0200
commit74ba34bb0554f581f408ebadd25bbc203b24b4aa (patch)
treed3fe143d8e96646f04457d85ad90e018f7a31a33 /Makefile.am
parent3b3a47b798b80c78446d9f062d311bcca135b177 (diff)
parent84620d89f988b0b763daea1f4ccae66acc062b19 (diff)
downloadlibimobiledevice-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 'Makefile.am')
0 files changed, 0 insertions, 0 deletions