anotherim/src/main/res
iNPUTmice 07b07115d6 Merge branch 'feature/foreground_service' into development
Conflicts:
	src/main/res/values/strings.xml
2014-11-15 15:51:27 +01:00
..
drawable Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
drawable-hdpi turn on foreground service in expert settings 2014-11-15 15:34:34 +01:00
drawable-mdpi turn on foreground service in expert settings 2014-11-15 15:34:34 +01:00
drawable-xhdpi turn on foreground service in expert settings 2014-11-15 15:34:34 +01:00
drawable-xxhdpi turn on foreground service in expert settings 2014-11-15 15:34:34 +01:00
layout added snackbar to indicate smp. more error handling in verify activity 2014-11-11 17:40:51 +01:00
layout-w360dp Make conversations the root project 2014-10-22 15:47:11 -04:00
layout-w384dp Make conversations the root project 2014-10-22 15:47:11 -04:00
layout-w600dp Make conversations the root project 2014-10-22 15:47:11 -04:00
layout-w960dp Make conversations the root project 2014-10-22 15:47:11 -04:00
menu made qr code available from muc and contact details as well 2014-11-04 12:15:14 +01:00
values Merge branch 'feature/foreground_service' into development 2014-11-15 15:51:27 +01:00
values-ca Make conversations the root project 2014-10-22 15:47:11 -04:00
values-cs Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
values-de Spelling fix in German translation 2014-11-14 22:13:42 -05:00
values-es formating 2014-11-09 21:27:37 +01:00
values-eu Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
values-fr Make conversations the root project 2014-10-22 15:47:11 -04:00
values-gl Make conversations the root project 2014-10-22 15:47:11 -04:00
values-it Spelling fixes in Italian translation 2014-11-14 22:16:58 -05:00
values-iw Make conversations the root project 2014-10-22 15:47:11 -04:00
values-nl Make conversations the root project 2014-10-22 15:47:11 -04:00
values-ru Make conversations the root project 2014-10-22 15:47:11 -04:00
values-sv Make conversations the root project 2014-10-22 15:47:11 -04:00
values-w820dp Convert about dialog to activity 2014-11-04 12:48:46 -05:00
values-zh-rCN Make conversations the root project 2014-10-22 15:47:11 -04:00
values-zh-rTW Make conversations the root project 2014-10-22 15:47:11 -04:00
xml turn on foreground service in expert settings 2014-11-15 15:34:34 +01:00