| commit | 19992c668afeb53a28e08a1f61572b5379f87590 | [log] [tgz] |
|---|---|---|
| author | Jonathan Beck <jonabeck@gmail.com> | Mon Mar 16 21:40:33 2009 +0100 |
| committer | Jonathan Beck <jonabeck@gmail.com> | Mon Mar 16 21:40:33 2009 +0100 |
| tree | 4f1784b81afe88a6240889961b5fc3d2b0d6a82e | |
| parent | 0d05f8de79ee91e9be80c6296eff9ce216582ba4 [diff] | |
| parent | 201e1ff5bf2054fcb1c0cc3cd7ba1e229dbde3fa [diff] |
Merge branch 'master' into contact_sync Conflicts: configure.ac dev/Makefile.am include/libiphone/libiphone.h src/AFC.c src/AFC.h src/Makefile.am