diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-07-14 15:27:23 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-07-14 15:27:23 -0300 |
| commit | a594ebe149ad81798984a410c036a0965df1581a (patch) | |
| tree | 9f92df878175fe438860b196b7394ec8f0bac4cd /~emulatorman | |
| parent | 03d128385c4ca773e67c93729a45899590d0d99e (diff) | |
| parent | d525d9a731f5d79c1128a192b9d2977a2967570f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/codeblocks/PKGBUILD
community/gnash/PKGBUILD
community/i3lock/PKGBUILD
community/instead/PKGBUILD
extra/asio/PKGBUILD
extra/cups/PKGBUILD
extra/libdrm/PKGBUILD
extra/liborigin2/PKGBUILD
extra/mesa/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/ocrad/PKGBUILD
extra/qtiplot/PKGBUILD
extra/scribus/PKGBUILD
extra/xdg-user-dirs/PKGBUILD
Diffstat (limited to '~emulatorman')
0 files changed, 0 insertions, 0 deletions