diff options
| author | cyBerta <richy@cyborgsociety.org> | 2013-11-10 23:37:25 +0100 |
|---|---|---|
| committer | cyBerta <richy@cyborgsociety.org> | 2013-11-10 23:37:25 +0100 |
| commit | 2cc19682a050e7675de4a8e5f470c7a408b46ac4 (patch) | |
| tree | d86a6acae0af635222965baaf91cb0d885d3b65b /.settings | |
| parent | fe6ff2c1250f75419f9fb54752eda2bdc6302f5d (diff) | |
| parent | 5e43d1ea5436af16f227a98fee495f707c885a96 (diff) | |
Merge remote-tracking branch 'base/develop' into develop-merge
Conflicts:
AndroidManifest.xml
Diffstat (limited to '.settings')
0 files changed, 0 insertions, 0 deletions