Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting...
authorjabarros <jabarros@solidgear.es>
Thu, 23 Oct 2014 09:06:05 +0000 (11:06 +0200)
committerjabarros <jabarros@solidgear.es>
Thu, 23 Oct 2014 09:06:05 +0000 (11:06 +0200)
commit6970560d2fc9272a13c478d48c2d5a578ca7d969
tree81503dff8f8c6bfd80c876571512bb0b069d980f
parent2fad1e1a996c1f6058445ca398a74743b0e93023
parentbc4a7bfe43cd48e8242ec38897874f1eb2a6c47a
Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files_2

Conflicts:
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
res/values-de/strings.xml
res/values/strings.xml
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java