diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-19 12:40:04 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-19 12:40:04 +0200 |
| commit | d186e96728bff4cc4873c59d48d01fe6eefe6131 (patch) | |
| tree | 1eefcef8058414b07b2750f52d9746f5323472ff /pcr/tokyotyrant/tokyotyrant.conf | |
| parent | 84c217e2d9acc64713978324761816e2468b5292 (diff) | |
| parent | 1fedf1f5d5351aefd88268cba7353c79adac9b8a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/collectd/PKGBUILD
community/drivel/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/gnomesu/PKGBUILD
community/gnuchess/PKGBUILD
community/gphpedit/PKGBUILD
community/gsql/PKGBUILD
community/libmatchbox/PKGBUILD
community/lockfile-progs/PKGBUILD
community/opencc/PKGBUILD
community/roxterm/PKGBUILD
community/uriparser/PKGBUILD
community/xcircuit/PKGBUILD
core/bison/PKGBUILD
core/curl/PKGBUILD
core/expat/PKGBUILD
core/gcc/PKGBUILD
core/gpm/PKGBUILD
core/m4/PKGBUILD
core/systemd/PKGBUILD
core/tar/PKGBUILD
extra/alsa-lib/PKGBUILD
extra/alsa-utils/PKGBUILD
extra/bitlbee/PKGBUILD
extra/chkrootkit/PKGBUILD
extra/fakechroot/PKGBUILD
extra/farstream/PKGBUILD
extra/freeglut/PKGBUILD
extra/gob2/PKGBUILD
extra/libcdio-paranoia/PKGBUILD
extra/liblqr/PKGBUILD
extra/libnl1/PKGBUILD
extra/libpst/PKGBUILD
extra/libwpd/PKGBUILD
extra/xorg-server/PKGBUILD
Diffstat (limited to 'pcr/tokyotyrant/tokyotyrant.conf')
0 files changed, 0 insertions, 0 deletions