aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2015-12-04 11:01:15 +0100
committersteckbrief <steckbrief@chefmail.de>2015-12-04 11:01:15 +0100
commit274a689dce6b903674cc738159bb112dcad17800 (patch)
tree5a2f4c24b837a4d3bad10ea84792a682e954851a /src/main/java/de
parentb405ba71067818ede536a9a0de5a2536ff4f3b52 (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/de')
-rw-r--r--src/main/java/de/thedevstack/android/logcat/ui/LogCatOutputActivity.java3
-rw-r--r--src/main/java/de/thedevstack/android/logcat/ui/LogCatOutputCopyOnClickListener.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/de/thedevstack/android/logcat/ui/LogCatOutputActivity.java b/src/main/java/de/thedevstack/android/logcat/ui/LogCatOutputActivity.java
index bb49c54d..477cfc48 100644
--- a/src/main/java/de/thedevstack/android/logcat/ui/LogCatOutputActivity.java
+++ b/src/main/java/de/thedevstack/android/logcat/ui/LogCatOutputActivity.java
@@ -7,7 +7,8 @@ import android.widget.ListView;
import de.thedevstack.android.logcat.adapters.LogCatArrayAdapter;
import de.thedevstack.android.logcat.tasks.ReadLogCatAsyncTask;
-import de.thedevstack.conversationsplus.R;
+
+import eu.siacs.conversations.R;
/**
* Created by tzur on 07.10.2015.
diff --git a/src/main/java/de/thedevstack/android/logcat/ui/LogCatOutputCopyOnClickListener.java b/src/main/java/de/thedevstack/android/logcat/ui/LogCatOutputCopyOnClickListener.java
index da82fc7f..1a37555a 100644
--- a/src/main/java/de/thedevstack/android/logcat/ui/LogCatOutputCopyOnClickListener.java
+++ b/src/main/java/de/thedevstack/android/logcat/ui/LogCatOutputCopyOnClickListener.java
@@ -10,7 +10,8 @@ import java.util.ArrayList;
import de.thedevstack.android.logcat.adapters.LogCatArrayAdapter;
import de.thedevstack.conversationsplus.ConversationsPlusApplication;
-import de.thedevstack.conversationsplus.R;
+
+import eu.siacs.conversations.R;
/**
* Created by tzur on 20.11.2015.