Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting...
authorjabarros <jabarros@solidgear.es>
Thu, 9 Oct 2014 15:26:02 +0000 (17:26 +0200)
committerjabarros <jabarros@solidgear.es>
Thu, 9 Oct 2014 15:26:02 +0000 (17:26 +0200)
commit7d9fc6857e1d534c1930b94b6063f1e21a827e9b
treefe94db353aff7dc4ccbc223bc26ab96b3117832f
parent95639df3ae0ed89cb70497bf0b3607d57f8e9aad
parentbe7eb6e932cd738d2ebaede935317fe1c71070fc
Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files

Conflicts:
res/menu/main_menu.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
res/menu/main_menu.xml
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