| commit | ad4cb0167ecc0861f74282aa9902e1b68ecea999 | [log] [tgz] |
|---|---|---|
| author | Akron <nils@diewald-online.de> | Mon Oct 24 19:15:09 2016 +0200 |
| committer | Akron <nils@diewald-online.de> | Mon Oct 24 19:15:09 2016 +0200 |
| tree | 866a5c928b96dd2c6203df991b8dbcef5d7b419c | |
| parent | 087d5dbaaad7f6a975ce6c1e8df8988e202fd7c6 [diff] | |
| parent | b3e9ccd8f24c3a7a5c8dbefc3fa2e1d0460da62d [diff] |
Fixed conflict Change-Id: Ifdcfb816f5c842dcaa5d1c29c177d25196353b4c