Merge branch 'xorg' into core-updates
authorAndreas Enge <andreas@enge.fr>
Thu, 4 Apr 2013 16:48:24 +0000 (18:48 +0200)
committerAndreas Enge <andreas@enge.fr>
Thu, 4 Apr 2013 16:49:28 +0000 (18:49 +0200)
commit6be960c7f7f8538024f5807dcd5b6a8a7562baf1
tree05a6712b7e8aa0fe2b4314767dc0219e85ea695e
parent9be8d7c8cb1b1ee4d1f3ba7360320527199b4a0d
parent8dc5d0cf7e18ee423c73087570c6b50d215ae216
Merge branch 'xorg' into core-updates
Makefile.am
guix/download.scm