From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 18 Sep 2014 07:31:24 +0000 (+0200)
Subject: Fixed conflict - Merge branch 'develop' into better_loggin_system
X-Git-Tag: oc-android-1.7.0_signed~176^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ea5c4760c2f150f907b17c2c8609ab1353a3ef62?hp=--cc

Fixed conflict - Merge branch 'develop' into better_loggin_system
---

ea5c4760c2f150f907b17c2c8609ab1353a3ef62
diff --cc src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
index 45a6aafe,85b04b22..5d3f7ace
--- a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
@@@ -33,8 -33,9 +33,9 @@@ import android.widget.TextView
  
  import com.actionbarsherlock.app.SherlockFragment;
  import com.owncloud.android.R;
 +import com.owncloud.android.lib.common.utils.Log_OC;
  import com.owncloud.android.ui.ExtendedListView;
+ import com.owncloud.android.ui.activity.OnEnforceableRefreshListener;
 -import com.owncloud.android.utils.Log_OC;
  
  /**
   *  TODO extending SherlockListFragment instead of SherlockFragment 
diff --cc src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 099e442f,4e768535..3665fe0b
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@@ -34,9 -34,9 +34,10 @@@ import com.owncloud.android.R
  import com.owncloud.android.datamodel.FileDataStorageManager;
  import com.owncloud.android.datamodel.OCFile;
  import com.owncloud.android.files.FileMenuFilter;
 +import com.owncloud.android.lib.common.utils.Log_OC;
  import com.owncloud.android.ui.activity.FileDisplayActivity;
  import com.owncloud.android.ui.activity.MoveActivity;
+ import com.owncloud.android.ui.activity.OnEnforceableRefreshListener;
  import com.owncloud.android.ui.adapter.FileListListAdapter;
  import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
  import com.owncloud.android.ui.dialog.RemoveFileDialogFragment;