diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-11 11:31:14 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-11 11:31:14 -0300 |
| commit | 93e6000b49f03ddf5a7046d325675ab43f58980b (patch) | |
| tree | 4202781c4124b57e808c9c6f51ba71e71484969e /social/tinc/tincd.conf | |
| parent | fe4dcf73c98bd9629ed703a027a4b812fb174cdd (diff) | |
| parent | 4141f5b04aab597f88a617a82649a404c773469a (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/haskell-binary/PKGBUILD
community/haskell-ghc-paths/PKGBUILD
community/virtualbox/PKGBUILD
extra/cscope/PKGBUILD
extra/pixman/PKGBUILD
extra/virtuoso/PKGBUILD
extra/xfce4-weather-plugin/PKGBUILD
Diffstat (limited to 'social/tinc/tincd.conf')
0 files changed, 0 insertions, 0 deletions