diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-06 09:54:55 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-06 09:54:55 -0300 |
| commit | 60f323f25d2c0addbce5832ffbda060b0410d14f (patch) | |
| tree | 644b9212e37f1a63dcef3977159033dee2f04392 /libre/linux-libre/linux-libre.install | |
| parent | 9e2eedaa4921b8d57c364fb3e2a8c9e2e96b8e69 (diff) | |
| parent | 817e58c278cb8ebee7743205877d0f67c431fcec (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/inetutils/PKGBUILD
extra/audacious/PKGBUILD
extra/cvs/PKGBUILD
kde-unstable/libkipi/PKGBUILD
libre/linux-libre/PKGBUILD
libre/mplayer-vaapi-libre/PKGBUILD
libre/pacman/PKGBUILD
libre/psutils-libre/PKGBUILD
libre/texlive-bin-libre/PKGBUILD
staging/kdebase-runtime/PKGBUILD
Diffstat (limited to 'libre/linux-libre/linux-libre.install')
| -rw-r--r-- | libre/linux-libre/linux-libre.install | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index badaceefd..bab05ffce 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,11 @@ # arg 2: the old package version KERNEL_NAME= +<<<<<<< HEAD KERNEL_VERSION=3.1.6-1-LIBRE +======= +KERNEL_VERSION=3.2.0-1-LIBRE +>>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c post_install () { # updating module dependencies |