diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-31 12:35:56 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-31 12:35:56 +0200 |
| commit | 0dc1411695376442c13f473499a876f085074d75 (patch) | |
| tree | 1ce41a87f86a15e6a72ae9e9198a05c755e293f0 /social/olsrd/rc.d.olsrd | |
| parent | e6e5e22dc82259030c1c26dc78bb4e761861abfc (diff) | |
| parent | 94a3b302f520438e919ef8706ce9cf42ad7c2e11 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/acpid/PKGBUILD
core/btrfs-progs/PKGBUILD
extra/calligra/PKGBUILD
extra/libxcursor/PKGBUILD
extra/xine-lib/PKGBUILD
Diffstat (limited to 'social/olsrd/rc.d.olsrd')
0 files changed, 0 insertions, 0 deletions