diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-03 19:01:45 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-03 19:01:45 +0100 |
| commit | 0d39ef7beb328ed4956d782e184cef3b8a30517e (patch) | |
| tree | 3fafb1d13f5780a139108168571cd8489a4f7fc1 /extra/brasero | |
| parent | c30d005256fc3ab9f8b83e4fded88289025ab4bf (diff) | |
| parent | e363875b14479aa4c6ff12f3e4e7ed920df4e45f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/celt/PKGBUILD
extra/llvm/PKGBUILD
extra/rasqal/PKGBUILD
extra/rdesktop/PKGBUILD
extra/speex/PKGBUILD
extra/wireshark/PKGBUILD
extra/xorg-sessreg/PKGBUILD
extra/xorg-xdpyinfo/PKGBUILD
extra/xorg-xset/PKGBUILD
Diffstat (limited to 'extra/brasero')
0 files changed, 0 insertions, 0 deletions