summaryrefslogtreecommitdiff
path: root/extra/oprofile
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-04-18 10:54:09 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-04-18 10:54:09 +0200
commitd4a02502a9a74a21bc0ca0a0fa9813efe0fe70f4 (patch)
tree3e5dfb37d192bd42d9218934800e1f5aeeb0990e /extra/oprofile
parent16d51ac66fa18675d49ef64f4a3c1dbe53b5711a (diff)
parent637c1cfdcd258a870ad5367cbf47a8a2799039c7 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/shotwell/PKGBUILD community/recoll/PKGBUILD cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.12.2-ignore-origin-of-privileged-program.patch cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-__i686.patch cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD cross/mips64el-unknown-linux-gnu-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch cross/mips64el-unknown-linux-gnu-glibc/glibc-__i686.patch staging/nx-common/PKGBUILD staging/nx/PKGBUILD testing/devhelp/PKGBUILD testing/empathy/PKGBUILD testing/evolution-data-server/PKGBUILD testing/evolution-ews/PKGBUILD testing/evolution-exchange/PKGBUILD testing/evolution/PKGBUILD testing/folks/PKGBUILD testing/gcr/PKGBUILD testing/gnome-control-center/PKGBUILD testing/gnome-desktop/PKGBUILD testing/gnome-documents/PKGBUILD testing/gnome-keyring/PKGBUILD testing/gnome-panel/PKGBUILD testing/gnome-session/PKGBUILD testing/gnome-settings-daemon/PKGBUILD testing/gnome-terminal/PKGBUILD testing/gnome-themes-standard/PKGBUILD testing/gthumb/PKGBUILD testing/gtkhtml4/PKGBUILD testing/gtksourceview3/PKGBUILD testing/gvfs/PKGBUILD testing/libgnome-keyring/PKGBUILD testing/librsvg/PKGBUILD testing/librsvg/librsvg.install testing/mousetweaks/PKGBUILD testing/seahorse/PKGBUILD testing/sushi/PKGBUILD testing/totem-plparser/PKGBUILD testing/totem/PKGBUILD testing/vte3/PKGBUILD
Diffstat (limited to 'extra/oprofile')
0 files changed, 0 insertions, 0 deletions