diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-03 10:42:41 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-03 10:42:41 +0100 |
| commit | ab6933b5cc48c6dfb3390b78c579832ba87e001d (patch) | |
| tree | acf5e3b5502a20a7458167e39d9c7c75b96f27cb /extra/xfce4-settings | |
| parent | b93266a2e63bdf4d37a87a5e59ff36d78de40be0 (diff) | |
| parent | 945c9cd1e94fab87653f84598812dec707843d26 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gmerlin/PKGBUILD
community/volumeicon/PKGBUILD
extra/graphite/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/openjdk6/PKGBUILD
extra/qt4/PKGBUILD
Diffstat (limited to 'extra/xfce4-settings')
0 files changed, 0 insertions, 0 deletions