diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-19 11:22:26 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-19 11:22:26 +0100 |
| commit | 56bf63be7060f55d0048fc1f2e37526723bf0dc7 (patch) | |
| tree | 5072df371092a3bfded8d6aadca1af5018523291 /.hgignore | |
| parent | d697117f3e2c400f8a7cae7bbbbf27166edc277a (diff) | |
| parent | b54c21859be3590a319ceade1f58d0b89ac5ef32 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/chmsee/PKGBUILD
community/projectm/PKGBUILD
extra/apache/PKGBUILD
extra/gv/PKGBUILD
extra/libdc1394/PKGBUILD
extra/libraw1394/PKGBUILD
extra/samba/PKGBUILD
extra/sg3_utils/PKGBUILD
extra/upower/PKGBUILD
extra/xf86-input-aiptek/PKGBUILD
extra/xf86-video-modesetting/PKGBUILD
extra/xorg-server/PKGBUILD
libre/rp-pppoe-libre/PKGBUILD
Diffstat (limited to '.hgignore')
0 files changed, 0 insertions, 0 deletions