fhdk a9d784470c Merge branch 'v17.1' into manjaro-architect ... # Conflicts: # community/awesome/Packages-Root # community/awesome/profile.conf # community/bspwm-mate/Packages-Root # community/bspwm/Packages-Root # community/lxqt/Packages-Live # community/lxqt/profile.conf # community/openbox/Packages-Desktop # community/openbox/live-overlay/etc/skel/.config/openbox/menu.xml # community/openbox/profile.conf # manjaro/architect/profile.conf # manjaro/netinstall/profile.conf		2018-08-25 10:45:27 +02:00
..
desktop-overlay/etc	Merge branch 'v17.1' into manjaro-architect	2018-08-25 10:45:27 +02:00
live-overlay	Merge branch 'v17.1' into manjaro-architect	2018-08-25 10:45:27 +02:00
Packages-Desktop	Merge branch 'v17.1' into manjaro-architect	2018-08-25 10:45:27 +02:00
profile.conf	Merge branch 'v17.1' into manjaro-architect	2018-08-25 10:45:27 +02:00