akwizgran 9bb298ed44 Merge branch '174-bsp-renaming-again' ...

Conflicts:
	briar-android/src/org/briarproject/android/contact/ConversationActivity.java

2015-12-16 10:42:44 +00:00

..

ContactListActivity.java

Moved MessageHeader to sync package.

2015-12-15 15:05:16 +00:00

ContactListAdapter.java

Whitespace-only code formatting changes.

2015-11-30 09:38:25 +00:00

ContactListItem.java

Moved MessageHeader to sync package.

2015-12-15 15:05:16 +00:00

ContactListItemComparator.java

Prettier display of available forums, cleaned up list comparators.

2014-02-27 16:25:47 +00:00

ConversationActivity.java

Merge branch '174-bsp-renaming-again'

2015-12-16 10:42:44 +00:00

ConversationAdapter.java

Moved MessageHeader to sync package.

2015-12-15 15:05:16 +00:00

ConversationItem.java

Moved MessageHeader to sync package.

2015-12-15 15:05:16 +00:00

ConversationItemComparator.java

Whitespace-only code formatting changes.

2015-11-30 09:38:25 +00:00

ReadPrivateMessageActivity.java

Moved classes from messaging package to sync package.

2015-12-15 15:05:06 +00:00

SelectContactsDialog.java

Whitespace-only code formatting changes.

2015-11-30 09:38:25 +00:00

WritePrivateMessageActivity.java

Moved classes from messaging package to sync package.

2015-12-15 15:05:06 +00:00