commit | 2a99f4e23c6db37e433282d4ed3d616e23d067d9 | [log] [tgz] |
---|---|---|
author | Alexandre Savard <alexandre.savard@savoirfairelinux.com> | Tue Sep 04 10:50:53 2012 -0400 |
committer | Alexandre Savard <alexandre.savard@savoirfairelinux.com> | Tue Sep 04 10:50:53 2012 -0400 |
tree | f81aaa3ce55089c55b4bcdc8c84b54e43642857a | |
parent | f4cb9709d47175865da529a2c283925bc85b73fb [diff] | |
parent | a6caa21addfd6175b4fad6503aa9bf621d5f0552 [diff] |
Merge branch 'master' of git.savoirfairelinux.com:sflphone-android Conflicts: jni/sflphone