diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-08 11:09:08 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-08 11:09:08 +0200 |
commit | f34af07e4fe5a7e9709810d27db1826afb33e9d7 (patch) | |
tree | 32b42eab1c13ef4a8651fdcb7ec34b677910b011 /extra/xorg-xsetroot | |
parent | 9d61e52a90bc3f2ec68af6824a49352c425cf08c (diff) | |
parent | 6186582583ec0329ab93bace8731cdb3b6f0dac8 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/wireshark/PKGBUILD
Diffstat (limited to 'extra/xorg-xsetroot')
0 files changed, 0 insertions, 0 deletions