diff options
| author | Christian S <christian@pix-art.de> | 2015-11-29 18:27:37 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-11-29 18:27:37 +0100 |
| commit | 53921a154c3ee540271d62c632887b96d8d28a9e (patch) | |
| tree | 98c6a76b4fc02982f85942524aa94180da09c880 /src/main/res/xml | |
| parent | 2aebe6e56b4268dddfbd7f1cecf9dcab2de28026 (diff) | |
| parent | d8ec3153655ceb716349fdc3c7d7106b22fd8d8a (diff) | |
Merge branch 'refs/heads/siacs-master' into development
Diffstat (limited to 'src/main/res/xml')
0 files changed, 0 insertions, 0 deletions