diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-20 18:59:44 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-20 18:59:44 +0100 |
commit | 24ac25bb11036f62ff8c578c4d3e3dba5f3dbcef (patch) | |
tree | 40446a0370c5278300dbabb70bcface64e7b64a9 /community/qscintilla-qt3 | |
parent | 27127b7917b98352703db59967e23688e07a5d24 (diff) | |
parent | fecd6286e00e6e25458a7d1b8b80f6fdb236a7a2 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/instead/PKGBUILD
community/luasql/PKGBUILD
community/qtcreator/PKGBUILD
extra/dosfstools/PKGBUILD
Diffstat (limited to 'community/qscintilla-qt3')
0 files changed, 0 insertions, 0 deletions