fhdk 35f9db1cc0 Merge remote-tracking branch 'upstream/master'		2018-05-17 19:40:41 +02:00
..
awesome	resolve conflict	2018-05-07 21:25:59 +02:00
bspwm	resolve conflict	2018-05-07 21:25:59 +02:00
bspwm-mate	resolve conflict	2018-05-07 21:25:59 +02:00
budgie	[budgie] correction slick-greeter.conf; use actual icon-theme	2018-05-09 19:54:42 +02:00
cinnamon	[cinnamon] upd slick-greeter.conf	2018-05-07 23:19:11 +02:00
deepin	[Deepin] include firefox also for mini	2018-05-15 19:53:57 +02:00
i3	[i3] add shortcut manjaro-architect	2018-05-07 17:56:01 +02:00
kde-minimal	kde-minimal: do not explicitly install some base packages anymore	2018-05-05 00:19:21 +02:00
lxde	resolve conflict	2018-05-07 21:25:59 +02:00
lxqt	[lxqt, netinstall] upd/rebase sddm.conf	2018-05-08 22:24:00 +02:00
mate	resolve conflict	2018-05-07 21:25:59 +02:00
openbox	[openbox] fix live menu	2018-05-17 19:37:54 +02:00
webdad	add missing packages	2018-05-17 15:12:19 +01:00