| commit | 773d4a85d14b714407e3cca54d503897be10e1a5 | [log] [tgz] |
|---|---|---|
| author | Adrien Béraud <adrienberaud@gmail.com> | Fri Sep 20 13:32:11 2013 +1000 |
| committer | Adrien Béraud <adrienberaud@gmail.com> | Fri Sep 20 13:32:11 2013 +1000 |
| tree | 26be5fc587eedd7fe645b4e6c375289f4e107aae | |
| parent | 39b408bcbf956acb101d7b2243ef16d1d8cc2364 [diff] | |
| parent | 261eb33f1cb66f8a0fa569fa55402b97af9236b2 [diff] |
Merge branch 'master' of git.savoirfairelinux.com:android-branch Conflicts: jni/pjproject-android/configure-android