shr.conf: merge minimal.conf to shr.conf directly, remove all preferred-xorg-versions...
authorMartin Jansa <Martin.Jansa@gmail.com>
Tue, 24 Nov 2009 09:06:16 +0000 (10:06 +0100)
committerMartin Jansa <Martin.Jansa@gmail.com>
Tue, 24 Nov 2009 12:40:50 +0000 (13:40 +0100)
commit033c08104afc48752ca44149e2ba3589b337f60f
tree6f5f5dea31489c42954a41ea18c64b15bd87fa52
parentf56a544c49284c258c5c46520752b7be0c0f2379
shr.conf: merge minimal.conf to shr.conf directly, remove all preferred-xorg-versions includes (7.4 as well as 7.5)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-By: Sebastian Spaeth <Sebastian@SSpaeth.de>
conf/distro/shr.conf