Vincent Breitmoser 29145e49c9 merge: different msg if nothing was merged

2014-07-15 19:17:08 +02:00

..

src/main

merge: different msg if nothing was merged

2014-07-15 19:17:08 +02:00

.gitignore

Fix gitignore for lint

2014-04-09 16:36:28 +02:00

build.gradle

travis: get rid of lint

2014-07-11 16:39:31 +02:00