Peters Git server - pub/Android/ownCloud.git/commit

projects / pub / Android / ownCloud.git / commit

author	tobiasKaminsky <tobias@kaminsky.me>
	Sun, 18 Jan 2015 16:00:29 +0000 (17:00 +0100)
committer	tobiasKaminsky <tobias@kaminsky.me>
	Sun, 18 Jan 2015 16:00:29 +0000 (17:00 +0100)
commit	6d5c6f86e5fa9a2edb51562d028554cbc49cdf93
tree	be0516dc3232cbd3c293dc5d016bf56fb21a88a1	tree \| snapshot (tar.gz tar.bz2 zip)
parent	f273fe03fafe38c9d275d091138255dabc7aa45c	commit \| diff
parent	bdb959f2e217c9c0bc28e0c1ba55bf6fb6f632b1	commit \| diff

Merge branch 'develop2' into imageGrid2

Conflicts:
owncloud-android-library
res/layout/list_fragment.xml
res/values-fr/strings.xml
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java

ownCloud Android App

RSS Atom

res/layout/list_fragment.xml	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/ui/adapter/FileListListAdapter.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/ui/fragment/OCFileListFragment.java	diff1 \|	diff2 \|	blob \| history