diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-02 09:38:50 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-02 09:38:50 +0200 |
commit | b4e4bd9b44479ab23dbbeaf58ba35e25ff345df1 (patch) | |
tree | 49dafd3110cca5d6f5054d4f9ef04957ec7b53a6 /~emulatorman/iceape-l10n | |
parent | 7d33f92ae992837f61fe5db4535e95dfec6924fa (diff) | |
parent | c9738c6a1d438f30dfa7363aa847343754f953ac (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/fcitx-mozc/PKGBUILD
community/libfm/PKGBUILD
community/sxiv/PKGBUILD
extra/pulseaudio/PKGBUILD
Diffstat (limited to '~emulatorman/iceape-l10n')
0 files changed, 0 insertions, 0 deletions