Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
BobStore/F-Droid/res
History
Peter Serwylo 0e5c039536 Merge branch 'master' into new-swap 
Fixed lots of (minor) conflicts. Some due to earlier rebasing of
material stuff that was subsequently merged into master with a
different commit hash (I guess, that's what it looked like anyway).
2015-07-27 18:42:16 +10:00
..
drawable
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
drawable-hdpi
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
drawable-ldpi
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
drawable-mdpi
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
drawable-xhdpi
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
drawable-xxhdpi
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
drawable-xxxhdpi
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
layout
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
layout-land
Use the same fragment id for portrait & landscape
2015-03-13 14:48:58 +01:00
layout-v11
WIP: Implementing UI mockup, different "selected" indicator for swap.
2015-06-11 08:21:10 +10:00
layout-v14
Cleanup after rebase.
2015-05-13 16:54:17 +10:00
layout-v17
WIP: Implementing UI mockup, different "selected" indicator for swap.
2015-06-11 08:21:10 +10:00
menu
Merge branch 'nathan-bluetooth-swap' into nearby-peers-with-bluetooth
2015-07-15 17:42:03 +10:00
values
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
values-ar
Remove partial arrays to fix theme selection crashes
2015-06-30 10:22:05 -07:00
values-bg
Run remove-unused-trans script
2015-06-17 12:09:05 +02:00
values-ca
rename string status_processing_xml to prevent crashes on old translations
2015-07-13 10:32:08 -07:00
values-cs
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
values-de
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
values-el
rename string status_processing_xml to prevent crashes on old translations
2015-07-13 10:32:08 -07:00
values-eo
Remove partial arrays to fix theme selection crashes
2015-06-30 10:22:05 -07:00
values-es
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
values-eu
Remove partial arrays to fix theme selection crashes
2015-06-30 10:22:05 -07:00
values-fa
rename string status_processing_xml to prevent crashes on old translations
2015-07-13 10:32:08 -07:00
values-fi
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
values-fr
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
values-gl
rename string status_processing_xml to prevent crashes on old translations
2015-07-13 10:32:08 -07:00
values-gu
Remove partial arrays to fix theme selection crashes
2015-06-30 10:22:05 -07:00
values-he
Run remove-partial-arrays
2015-03-08 20:34:58 +01:00
values-hu
rename string status_processing_xml to prevent crashes on old translations
2015-07-13 10:32:08 -07:00
values-it
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
values-ja
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
values-ko
rename string status_processing_xml to prevent crashes on old translations
2015-07-13 10:32:08 -07:00
values-lt
Remove partial arrays to fix theme selection crashes
2015-06-30 10:22:05 -07:00
values-nb
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
values-nl
rename string status_processing_xml to prevent crashes on old translations
2015-07-13 10:32:08 -07:00
values-pl
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
values-pt-rBR
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
values-ro
Remove partial arrays to fix theme selection crashes
2015-06-30 10:22:05 -07:00
values-ru
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
values-sc
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
values-sk
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
values-sl
Remove partial arrays to fix theme selection crashes
2015-06-30 10:22:05 -07:00
values-sr
rename string status_processing_xml to prevent crashes on old translations
2015-07-13 10:32:08 -07:00
values-sv
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
values-tr
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00
values-ug
rename string status_processing_xml to prevent crashes on old translations
2015-07-13 10:32:08 -07:00
values-uk
Remove partial arrays to fix theme selection crashes
2015-06-30 10:22:05 -07:00
values-v11
Made swap button text white.
2015-06-15 21:19:14 +02:00
values-v21
More colours beyond colorPrimary.
2015-06-15 21:19:14 +02:00
values-zh
Remove partial arrays to fix theme selection crashes
2015-06-30 10:22:05 -07:00
values-zh-rCN
rename string status_processing_xml to prevent crashes on old translations
2015-07-13 10:32:08 -07:00
values-zh-rHK
Remove partial arrays to fix theme selection crashes
2015-06-30 10:22:05 -07:00
xml
Merge branch 'master' into new-swap
2015-07-27 18:42:16 +10:00