tobiasKaminsky f331120a14 Merge remote-tracking branch 'upstream/develop' into imageGrid ... Conflicts: owncloud-android-library res/layout/list_item.xml src/com/owncloud/android/ui/adapter/FileListListAdapter.java src/com/owncloud/android/ui/fragment/LocalFileListFragment.java		2014-11-05 22:07:11 +01:00
..
copy_link.png	Implemented option to copy shared link in clipboard instead of trusting in external clipboard front-ends	2014-02-19 18:00:49 +01:00
file.png	- new icons	2014-10-04 11:56:43 +02:00
file_doc.png	- new icons	2014-10-04 11:56:43 +02:00
file_image.png	- new icons	2014-10-04 11:56:43 +02:00
file_movie.png	- new icons	2014-10-04 11:56:43 +02:00
file_pdf.png	- new icons	2014-10-04 11:56:43 +02:00
file_ppt.png	- new icons	2014-10-04 11:56:43 +02:00
file_sound.png	- new icons	2014-10-04 11:56:43 +02:00
file_xls.png	- new icons	2014-10-04 11:56:43 +02:00
file_zip.png	- new icons	2014-10-04 11:56:43 +02:00
folder_public.png	- update folder_public name	2014-10-20 19:46:10 +02:00
ic_menu_archive.png	- new icons	2014-10-04 11:56:43 +02:00
icon.png	Added app icon for xhdpi	2014-01-21 14:30:33 +01:00
shared_with_me.png	Replace old sharelink icon for new one. Add 'shared with me' new icons	2014-07-01 09:59:29 +02:00
shared_with_me_folder.png	- new icons	2014-10-04 11:56:43 +02:00
sharedlink.png	Change folder and rigth shared by link icons	2014-08-01 10:38:37 +02:00