diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-09-26 10:56:45 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-09-26 10:56:45 +0200 |
| commit | d0f652308cf1d8d121c6e3656b0c2726e523bc1f (patch) | |
| tree | cc84605593cd149aaaa16aaa711c64610970e072 /app/jni/dummy.cpp | |
| parent | e5d9306d5d536d28b617f9dc2e42226e03462c70 (diff) | |
| parent | 8c4b3edafc68e647bd44ae456c15f0aea9d45905 (diff) | |
Merge branch 'develop' into release-0.7.0
Diffstat (limited to 'app/jni/dummy.cpp')
0 files changed, 0 insertions, 0 deletions