diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-12 13:04:54 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-12 13:04:54 +0100 |
| commit | 24633b6f6af8dc77ca77224448d226d8e99c9ce1 (patch) | |
| tree | 0e862445be6a105957104f94f7e4f2668e1fdbba /community/confuse | |
| parent | d28ed89b1e41f7e71045a5c2e898aa3b369eda47 (diff) | |
| parent | 8c2563c3c13cb7a279544f6926cbdd2eb902cc9a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cdemu-daemon/PKGBUILD
community/chmsee/PKGBUILD
community/fceux/PKGBUILD
community/ginac/PKGBUILD
community/gstreamermm/PKGBUILD
community/gtksourceviewmm/PKGBUILD
community/lgi/PKGBUILD
community/libmirage/PKGBUILD
core/gawk/PKGBUILD
core/gettext/PKGBUILD
extra/enca/PKGBUILD
extra/gnutls/PKGBUILD
extra/hdf5/PKGBUILD
extra/kdebase/PKGBUILD
extra/libass/PKGBUILD
extra/libdiscid/PKGBUILD
extra/libxcomposite/PKGBUILD
extra/libxdamage/PKGBUILD
extra/maxima/PKGBUILD
extra/nx/PKGBUILD
extra/opencv/PKGBUILD
extra/pidgin/PKGBUILD
extra/redland/PKGBUILD
extra/sharutils/PKGBUILD
extra/soundtouch/PKGBUILD
extra/sqlite/PKGBUILD
extra/twisted/PKGBUILD
libre/dpkg/PKGBUILD
Diffstat (limited to 'community/confuse')
| -rw-r--r--[-rwxr-xr-x] | community/confuse/PKGBUILD | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/community/confuse/PKGBUILD b/community/confuse/PKGBUILD index 14cc92378..14cc92378 100755..100644 --- a/community/confuse/PKGBUILD +++ b/community/confuse/PKGBUILD |