summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-06-02 10:16:30 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-06-02 10:16:30 +0200
commit972fee03646b0f7a3398b80ea6dc35ab03645ab8 (patch)
tree1fd929967dc8653b0365a1caacce01ca2e62d9b4 /.hgignore
parentc2cd1a03ef163e499176aa788488e845d2cd94fd (diff)
parent8831500349d38b0b1afcb74ada3f6878c31fb6ef (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/jack2/PKGBUILD extra/libxext/PKGBUILD extra/libxrandr/PKGBUILD extra/libxv/PKGBUILD extra/openobex/PKGBUILD
Diffstat (limited to '.hgignore')
0 files changed, 0 insertions, 0 deletions