anotherim/src/main/res/menu
Sam Whited 46f147a82c Merge branch 'gradle' into development
Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib
2014-10-30 15:33:13 -04:00
..
attachment_choices.xml Make conversations the root project 2014-10-22 15:47:11 -04:00
choose_contact.xml Make conversations the root project 2014-10-22 15:47:11 -04:00
conference_context.xml Make conversations the root project 2014-10-22 15:47:11 -04:00
contact_context.xml Make conversations the root project 2014-10-22 15:47:11 -04:00
contact_details.xml Make conversations the root project 2014-10-22 15:47:11 -04:00
conversations.xml Make conversations the root project 2014-10-22 15:47:11 -04:00
encryption_choices.xml Make conversations the root project 2014-10-22 15:47:11 -04:00
manageaccounts.xml Make conversations the root project 2014-10-22 15:47:11 -04:00
manageaccounts_context.xml Make conversations the root project 2014-10-22 15:47:11 -04:00
message_context.xml Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
muc_details.xml Make conversations the root project 2014-10-22 15:47:11 -04:00
share_with.xml Make conversations the root project 2014-10-22 15:47:11 -04:00
start_conversation.xml Make conversations the root project 2014-10-22 15:47:11 -04:00