Merge branch 'master' into lukeshu/xbslukeshu/xbs

# Conflicts:
#	config

1 files changed, 6 insertions, 5 deletions

diff --git a/config b/config
index 75eae37..a9b1a09 100644
--- a/config
+++ b/config
@@ -11,11 +11,12 @@ esac
 
 FTP_BASE="/srv/repo/main"
 PKGREPOS=()
-# PKGREPOS=(
-# 	'core' 'testing' 'extra' 'community' 'multilib' 'multilib-testing'
-# 	'libre' 'libre-testing' 'libre-multilib' 'libre-multilib-testing'
-# 	'~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan'
-# 	'nonsystemd' 'nonsystemd-testing' 'nonprism' 'nonprism-testing' 'pcr' 'kernels' 'cross' 'java')
+#PKGREPOS=(
+#	'core' 'testing' 'extra' 'community' 'multilib' 'multilib-testing'
+#	'libre' 'libre-testing' 'libre-multilib' 'libre-multilib-testing'
+#	'~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan'
+#	'nonsystemd' 'nonsystemd-testing' 'nonprism' 'nonprism-testing' 'pcr' 'pcr-testing' 'kernels'
+#	'cross' 'java' 'unmaintained')
 PKGPOOL=''
 SRCPOOL=''