diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-14 18:16:51 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-14 18:16:51 +0200 |
| commit | b32e36625b44b5c002c417ab4faf6311258c7671 (patch) | |
| tree | 87f91f6f7d9ccb229f9c7613f5411534bd504f5e /community/desmume | |
| parent | 1a274201c465801ed2271018f426f0eaf7098215 (diff) | |
| parent | 35c30674b2b901077a809a6f1d8e5a0115098c8b (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/mplayer2/PKGBUILD
community/pcmanfm/PKGBUILD
extra/liblrdf/PKGBUILD
extra/php-apc/PKGBUILD
extra/sqlite/PKGBUILD
kde-unstable/libkgapi/PKGBUILD
kde-unstable/soprano/PKGBUILD
multilib/lib32-libphobos-ldc/PKGBUILD
multilib/lib32-pixman/PKGBUILD
multilib/lib32-sqlite3/PKGBUILD
Diffstat (limited to 'community/desmume')
0 files changed, 0 insertions, 0 deletions