aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJybz <j.biernacki@free.fr>2021-02-21 09:38:19 +0100
committerJybz <j.biernacki@free.fr>2021-02-21 09:38:19 +0100
commit5a055e6111fa8f31c987ecda06fb342e94e66916 (patch)
tree388c9b8459483151f1d003bd07d8f4c4e9d09caf
parent7e6281356a8f9c38373ce1c86d4b0cbf24b288e5 (diff)
parent4a5c94a2349689c884950eb3630033cab9f2c54b (diff)
downloadmageia4arm-5a055e6111fa8f31c987ecda06fb342e94e66916.tar
mageia4arm-5a055e6111fa8f31c987ecda06fb342e94e66916.tar.gz
mageia4arm-5a055e6111fa8f31c987ecda06fb342e94e66916.tar.bz2
mageia4arm-5a055e6111fa8f31c987ecda06fb342e94e66916.tar.xz
mageia4arm-5a055e6111fa8f31c987ecda06fb342e94e66916.zip
Merge branch 'master' of ssh://git.mageia.org/software/mageia4arm
Update my local branch, merge modifications from upstream. .
-rw-r--r--mageia4arm.conf.json6
1 files changed, 3 insertions, 3 deletions
diff --git a/mageia4arm.conf.json b/mageia4arm.conf.json
index f992692..63478c5 100644
--- a/mageia4arm.conf.json
+++ b/mageia4arm.conf.json
@@ -9,14 +9,14 @@
"Available_desktoplist":[ "cinnamon","cinnamon-minimal","enlightenment","enlightenment-minimal","fvwm2","gnome","gnome-minimal","lxde","lxde-minimal","lxqt","lxqt-minimal","mate","mate-minimal","plasma5","plasma5-minimal","sugar","windowmaker","xfce","xfce-minimal"],
"SBCs": [
- { "board":"bananaPro", "desktop":null, "extra_packages":null, "nonfree":true, "size":2 }
+ { "board":"bananaPro", "desktop":null, "extra_packages":null, "nonfree":true, "size":2 },
{ "board":"rpi-aarch64", "desktop":"plasma5-minimal", "extra_packages":null, "nonfree":true, "size":6 }
],
"Available_SBCs": [
{ "board":"bananaPro", "desktop":null, "extra_packages":null, "nonfree":true, "size":2 },
- { "board":"rpi-aarch64", "desktop":null, "extra_packages":null, "nonfree":true, "size":3 }
- { "board":"rpi-aarch64", "desktop":"plasma5-minimal", "extra_packages":null, "nonfree":true, "size":6 }
+ { "board":"rpi-aarch64", "desktop":null, "extra_packages":null, "nonfree":true, "size":3 },
+ { "board":"rpi-aarch64", "desktop":"plasma5-minimal", "extra_packages":null, "nonfree":true, "size":6 },
{ "board":"generic_aarch64", "desktop":null, "extra_packages":null, "nonfree":false, "size":2 },
{ "board":"rpi2", "desktop":null, "extra_packages":null, "nonfree":false, "size":2 },
{ "board":"rpi3+64", "desktop":"lxde", "extra_packages":null, "nonfree":false, "size":2 }