diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-01 11:35:39 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-01 11:35:39 -0300 |
| commit | 1192f92b3117f045d8a6e01bdc18a71d4ce7e980 (patch) | |
| tree | f142ada32802fc41be79d63118bbfd3f692c3485 /core/tzdata/PKGBUILD | |
| parent | a3eb7624c72208c02fb4778c487ac9458436cca0 (diff) | |
| parent | 560562e36a27da267f2f4f7989806790192888ef (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dictd/PKGBUILD
community/libmaa/PKGBUILD
core/gcc/PKGBUILD
core/glibc/PKGBUILD
extra/libatasmart/PKGBUILD
extra/llvm/PKGBUILD
extra/pidgin/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/gcc-multilib/gcc_pure64.patch
multilib/lib32-glibc/PKGBUILD
multilib/lib32-glibc/glibc-2.14-libdl-crash.patch
multilib/lib32-glibc/lib32-glibc.conf
multilib/lib32-pcre/PKGBUILD
multilib/libtool-multilib/PKGBUILD
Diffstat (limited to 'core/tzdata/PKGBUILD')
0 files changed, 0 insertions, 0 deletions