Merge branch '174-bsp-renaming-again' (9bb298ed) · Commits · Julian Dehm / briar

Commit 9bb298ed authored 9 years ago by akwizgran

Merge branch '174-bsp-renaming-again'

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

parents 8fa05e54 2ca2356e

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/org/briarproject/android/AndroidNotificationManagerImpl.java 1 addition, 1 deletion

.../briarproject/android/AndroidNotificationManagerImpl.java
briar-android/src/org/briarproject/android/BriarService.java 1 addition, 1 deletion

briar-android/src/org/briarproject/android/BriarService.java
briar-android/src/org/briarproject/android/contact/ContactListActivity.java 36 additions, 36 deletions

...org/briarproject/android/contact/ContactListActivity.java
briar-android/src/org/briarproject/android/contact/ContactListItem.java 4 additions, 4 deletions

...src/org/briarproject/android/contact/ContactListItem.java
briar-android/src/org/briarproject/android/contact/ConversationActivity.java 7 additions, 7 deletions

...rg/briarproject/android/contact/ConversationActivity.java
briar-android/src/org/briarproject/android/contact/ConversationAdapter.java 15 additions, 16 deletions

...org/briarproject/android/contact/ConversationAdapter.java
briar-android/src/org/briarproject/android/contact/ConversationItem.java 2 additions, 2 deletions

...rc/org/briarproject/android/contact/ConversationItem.java
briar-android/src/org/briarproject/android/contact/ReadPrivateMessageActivity.java 26 additions, 26 deletions

...arproject/android/contact/ReadPrivateMessageActivity.java
briar-android/src/org/briarproject/android/contact/WritePrivateMessageActivity.java 35 additions, 35 deletions

...rproject/android/contact/WritePrivateMessageActivity.java
briar-android/src/org/briarproject/android/forum/AvailableForumsActivity.java 2 additions, 2 deletions

...g/briarproject/android/forum/AvailableForumsActivity.java
briar-android/src/org/briarproject/android/forum/AvailableForumsItem.java 1 addition, 1 deletion

...c/org/briarproject/android/forum/AvailableForumsItem.java
briar-android/src/org/briarproject/android/forum/CreateForumActivity.java 3 additions, 3 deletions

...c/org/briarproject/android/forum/CreateForumActivity.java
briar-android/src/org/briarproject/android/forum/ForumActivity.java 4 additions, 4 deletions

...oid/src/org/briarproject/android/forum/ForumActivity.java
briar-android/src/org/briarproject/android/forum/ForumAdapter.java 1 addition, 1 deletion

...roid/src/org/briarproject/android/forum/ForumAdapter.java
briar-android/src/org/briarproject/android/forum/ForumContacts.java 1 addition, 1 deletion

...oid/src/org/briarproject/android/forum/ForumContacts.java
briar-android/src/org/briarproject/android/forum/ForumItem.java 1 addition, 1 deletion

...android/src/org/briarproject/android/forum/ForumItem.java
briar-android/src/org/briarproject/android/forum/ForumListActivity.java 3 additions, 3 deletions

...src/org/briarproject/android/forum/ForumListActivity.java
briar-android/src/org/briarproject/android/forum/ForumListItem.java 2 additions, 2 deletions

...oid/src/org/briarproject/android/forum/ForumListItem.java
briar-android/src/org/briarproject/android/forum/ReadForumPostActivity.java 2 additions, 2 deletions

...org/briarproject/android/forum/ReadForumPostActivity.java
briar-android/src/org/briarproject/android/forum/ShareForumActivity.java 1 addition, 1 deletion

...rc/org/briarproject/android/forum/ShareForumActivity.java

with 148 additions and 149 deletions

Please register or to comment