diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-08-18 18:21:03 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-08-18 18:21:03 +0200 |
| commit | 832ebd9d945dca50ddab9cba60d1e2114efb8be5 (patch) | |
| tree | 8a4d663e9f0acc168c0e5c466f0a7e24fb63da3e /app/jni/dummy.cpp | |
| parent | 6bc705f07359cf561012214a9f5c9e50e8373abf (diff) | |
| parent | 3ae1611abd6fac522712f0f5195bc07441923999 (diff) | |
Merge branch 'develop' into release-0.6.0
Diffstat (limited to 'app/jni/dummy.cpp')
0 files changed, 0 insertions, 0 deletions