diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-11 09:21:42 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-11 09:21:42 -0300 |
| commit | 68bbd16e228ad453736f552dc2b15c3be76cd1db (patch) | |
| tree | c7016052989d601ccbe8753d14b1380a44e480fd /community/acpid/acpid.socket | |
| parent | e99d7c51671fbbbc61348296a23ebc335c2693e9 (diff) | |
| parent | b44e3e7f16abe5e4cb428571db65d300b7cc44be (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/mingw32-pthreads/PKGBUILD
community/tesseract/PKGBUILD
extra/xorg-server/PKGBUILD
Diffstat (limited to 'community/acpid/acpid.socket')
0 files changed, 0 insertions, 0 deletions