From: Lennart Rosam <lennart@familie-rosam.de>
Date: Sun, 15 Apr 2012 10:41:36 +0000 (+0200)
Subject: Merge branch 'fragments-ui' of
X-Git-Tag: oc-android-1.4.3~443
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/51302a638677b16c5faac6242da44080794f537e?ds=inline;hp=--cc

Merge branch 'fragments-ui' of
ssh://git@gitorious.org/owncloud/android.git into fragments-ui

Conflicts:
	src/eu/alefzero/owncloud/datamodel/OCFile.java
---

51302a638677b16c5faac6242da44080794f537e
diff --cc src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index 10a8671e,5bf71466..5ae763cc
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@@ -272,4 -279,4 +279,4 @@@ public class FileDisplayActivity extend
  
  		
  	}
--}
++}