nextcloud-android/res
David A. Velasco 66f3a45d05 Merge branch 'develop' into navigationDrawer_basic
Conflicts FIXED:
	res/layout/files.xml
2015-06-15 13:43:17 +02:00
..
anim
drawable Updated to work with latest update 2015-05-27 18:50:09 +02:00
drawable-hdpi Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update 2015-05-21 21:12:44 +02:00
drawable-hdpi-v9
drawable-hdpi-v11
drawable-ldpi
drawable-ldpi-v9
drawable-mdpi Add ic_drawer for mdpi and xhdpi 2015-05-26 13:12:19 +02:00
drawable-mdpi-v9
drawable-mdpi-v11
drawable-xhdpi Add ic_drawer for mdpi and xhdpi 2015-05-26 13:12:19 +02:00
drawable-xhdpi-v11
layout Merge branch 'develop' into navigationDrawer_basic 2015-06-15 13:43:17 +02:00
layout-land Fixed style in log-in activity; should be Light, as before 2015-05-29 13:30:02 +02:00
layout-v11
layout-v14
menu Update main_menu.xml 2015-05-27 16:53:35 +02:00
raw
raw-de
raw-es
values Merge branch 'develop' into navigationDrawer_basic 2015-06-15 13:43:17 +02:00
values-af
values-af-rZA
values-ak
values-am-rET
values-ar
values-az
values-be
values-bg-rBG
values-bn-rBD
values-bn-rIN
values-bs
values-ca [tx-robot] updated from transifex 2015-05-28 01:13:53 -04:00
values-cs-rCZ [tx-robot] updated from transifex 2015-05-22 01:13:49 -04:00
values-cy-rGB
values-da [tx-robot] updated from transifex 2015-06-14 01:13:39 -04:00
values-de [tx-robot] updated from transifex 2015-05-23 01:13:49 -04:00
values-de-rAT
values-de-rCH
values-de-rDE [tx-robot] updated from transifex 2015-05-23 01:13:49 -04:00
values-el [tx-robot] updated from transifex 2015-06-10 01:13:39 -04:00
values-en-rGB [tx-robot] updated from transifex 2015-06-04 01:13:55 -04:00
values-en-rNZ
values-eo [tx-robot] updated from transifex 2015-06-02 01:13:46 -04:00
values-es [tx-robot] updated from transifex 2015-06-10 01:13:39 -04:00
values-es-rAR
values-es-rBO
values-es-rCL
values-es-rCO
values-es-rCR
values-es-rEC
values-es-rMX
values-es-rPE
values-es-rPY
values-es-rUS
values-es-rUY
values-et-rEE
values-eu
values-eu-rES
values-fa
values-fi
values-fi-rFI [tx-robot] updated from transifex 2015-05-22 01:13:49 -04:00
values-fr [tx-robot] updated from transifex 2015-06-10 01:13:39 -04:00
values-fr-rCA
values-fy-rNL
values-gl [tx-robot] updated from transifex 2015-06-10 01:13:39 -04:00
values-gu
values-he
values-hi
values-hi-rIN
values-hr
values-hu-rHU
values-hy
values-ia
values-id [tx-robot] updated from transifex 2015-05-18 01:13:50 -04:00
values-io
values-is
values-it [tx-robot] updated from transifex 2015-06-11 01:13:55 -04:00
values-ja-rJP
values-jv
values-ka
values-ka-rGE
values-km
values-kn
values-ko
values-ku-rIQ
values-large-land
values-lb
values-lo
values-lt-rLT
values-lv
values-mg
values-mk
values-ml
values-ml-rIN
values-mn
values-mr
values-ms-rMY
values-mt-rMT
values-my
values-nb-rNO [tx-robot] updated from transifex 2015-06-14 01:13:39 -04:00
values-ne
values-nl [tx-robot] updated from transifex 2015-06-10 01:13:39 -04:00
values-nn-rNO
values-oc [tx-robot] updated from transifex 2015-06-15 01:13:52 -04:00
values-or-rIN
values-pa
values-pl [tx-robot] updated from transifex 2015-06-15 01:13:52 -04:00
values-pt-rBR [tx-robot] updated from transifex 2015-06-10 01:13:39 -04:00
values-pt-rPT
values-ro
values-ru [tx-robot] updated from transifex 2015-06-11 01:13:55 -04:00
values-ru-rRU
values-si-rLK
values-sk
values-sk-rSK [tx-robot] updated from transifex 2015-06-12 01:13:56 -04:00
values-sl [tx-robot] updated from transifex 2015-06-13 01:13:55 -04:00
values-sq
values-sr [tx-robot] updated from transifex 2015-06-10 01:13:39 -04:00
values-sr-rSP
values-su
values-sv
values-sw-rKE
values-ta-rIN
values-ta-rLK
values-te
values-tg-rTJ
values-th-rTH [tx-robot] updated from transifex 2015-06-15 01:13:52 -04:00
values-tr [tx-robot] updated from transifex 2015-06-08 01:13:49 -04:00
values-tzl [tx-robot] updated from transifex 2015-06-02 01:13:46 -04:00
values-ug
values-uk [tx-robot] updated from transifex 2015-05-30 01:13:45 -04:00
values-ur
values-ur-rPK
values-uz
values-v9
values-v11
values-vi
values-yo
values-zh-rCN
values-zh-rHK
values-zh-rTW
xml Move 'Logs' from Settings to Navigation Drawer 2015-05-26 09:11:27 +02:00