diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-17 15:19:29 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-17 15:19:29 +0100 |
| commit | a66ad9f55f1788fcab4028fefb2c91e563fec35c (patch) | |
| tree | 93e3cfd6d5cee5dc334cd6582c789b1429f23694 /extra/fluxbox | |
| parent | 36128f354db7ef055305ffd69c29af225c6ca182 (diff) | |
| parent | 071ecd58a9b69020ec170e7f89009a603e885371 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/keepassx/PKGBUILD
core/iputils/PKGBUILD
extra/avidemux/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/kismet/PKGBUILD
extra/maxima/PKGBUILD
extra/sbcl/PKGBUILD
extra/sound-juicer/PKGBUILD
extra/wxgtk/PKGBUILD
kde-unstable/akonadi/PKGBUILD
libre/gstreamer0.10-bad-libre/PKGBUILD
Diffstat (limited to 'extra/fluxbox')
0 files changed, 0 insertions, 0 deletions