diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-11 11:42:51 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-11 11:42:51 -0300 |
| commit | 214c4f12ab4dfb21722a383924603c21698282c5 (patch) | |
| tree | 9a1b5e3e6476b5180a5727865778ba8f69c0a24a /extra/xorg-xinit/xserverrc | |
| parent | 5f132e10473a4d8845752a6aa16fbd8f3e432c6f (diff) | |
| parent | 01b47af6474ac094ec199c7d75208874f8842d87 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/openssh/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/libgnome/PKGBUILD
extra/sane/PKGBUILD
libre/kernel26-libre/PKGBUILD
Diffstat (limited to 'extra/xorg-xinit/xserverrc')
0 files changed, 0 insertions, 0 deletions