]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/commitdiff
Merge remote-tracking branch 'stevee/armv5tel-xorg-x11-server'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 20 May 2012 09:58:10 +0000 (11:58 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 20 May 2012 09:58:10 +0000 (11:58 +0200)
Conflicts:
xorg-x11-server/xorg-x11-server.nm

1  2 
xorg-x11-server/xorg-x11-server.nm

Simple merge