diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-07 09:16:08 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-07 09:16:08 +0200 |
| commit | 44d5db78dfc2e2180898d8db13822e339665b7a3 (patch) | |
| tree | 5a8ad6d447af343e4d43eb96a918e9f566460351 /community/gmerlin/PKGBUILD | |
| parent | c46eba9943dd0e63496ab3ee93cfb7da246386c9 (diff) | |
| parent | 334c2a7916a80d08b1c216cfbf02135e64891632 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/nbd/PKGBUILD
kde-unstable/kdeplasma-addons/PKGBUILD
kde-unstable/libkcompactdisc/PKGBUILD
Diffstat (limited to 'community/gmerlin/PKGBUILD')
0 files changed, 0 insertions, 0 deletions