diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-13 22:00:22 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-13 22:00:22 -0300 |
commit | b9930cb145be895813f48623c21b12acaf8e1dbf (patch) | |
tree | f878c72c58f3add6dcaf4ce56491acb1a01c8862 /community/libdaq | |
parent | 009cb3e36c303eb4460b20d01fb01522787198d9 (diff) | |
parent | 16e845de1bbf76ab48a02bfaa21730f45e6afaaa (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ccrtp/PKGBUILD
community/commoncpp2/PKGBUILD
core/ncurses/PKGBUILD
core/udev/PKGBUILD
multilib/lib32-libjpeg-turbo/PKGBUILD
Diffstat (limited to 'community/libdaq')
0 files changed, 0 insertions, 0 deletions