summaryrefslogtreecommitdiffstats
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2010-01-13 03:32:52 +0100
committerGravatar Martin Szulecki2010-01-13 03:32:52 +0100
commit0ea52d01b817e35e4d4fceb57c9267124e60dab3 (patch)
tree25d58fe018cda0cfc7d98682859b70fa58059413 /src/Makefile.am
parent75f30bd3c3c44c1db40f7b10fca5cc018a1fb079 (diff)
parent53a2b6ae429abc6979e6adab107f24d14c0f5a20 (diff)
downloadlibimobiledevice-0ea52d01b817e35e4d4fceb57c9267124e60dab3.tar.gz
libimobiledevice-0ea52d01b817e35e4d4fceb57c9267124e60dab3.tar.bz2
Merge branch 'master' of git://github.com/MattColyer/libiphone into martin
Conflicts: src/iphone.c
Diffstat (limited to 'src/Makefile.am')
0 files changed, 0 insertions, 0 deletions