| commit | 2a1509f126b8b819a105abac9c3b48201e672101 | [log] [tgz] |
|---|---|---|
| author | Alexandre Savard <alexandre.savard@savoirfairelinux.com> | Wed Aug 08 11:56:19 2012 -0400 |
| committer | Alexandre Savard <alexandre.savard@savoirfairelinux.com> | Wed Aug 08 11:56:19 2012 -0400 |
| tree | 88feff1baca2e13ceee7dac6af3a2eb77494c208 | |
| parent | 5d8347a9a4ca33001a5dbaf9382afa17cda88a8c [diff] | |
| parent | bd6f5f2a67dc1eb75b164cc37973c3102d78c9c2 [diff] |
Merge branch 'master' of git.savoirfairelinux.com:sflphone-android Conflicts: jni/sflphone