summaryrefslogtreecommitdiffstats
path: root/kde
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-02-12 13:58:38 +0100
committertnut <thierryn1 at hispeed dot ch>2010-02-12 13:58:38 +0100
commit4064f8cdc65469d5003709524765783874edee61 (patch)
treebfeb360783cd83e6710e89e668f4378c627f715a /kde
parent8a315d216205d889cc922cf5b57eefb1e6262740 (diff)
downloadnutyx-pakxe-4064f8cdc65469d5003709524765783874edee61.tar.gz
nutyx-pakxe-4064f8cdc65469d5003709524765783874edee61.tar.bz2
nutyx-pakxe-4064f8cdc65469d5003709524765783874edee61.tar.xz
nutyx-pakxe-4064f8cdc65469d5003709524765783874edee61.zip
kde, maj des dépendances
Diffstat (limited to 'kde')
-rwxr-xr-xkde/kde/Pkgfile10
1 files changed, 1 insertions, 9 deletions
diff --git a/kde/kde/Pkgfile b/kde/kde/Pkgfile
index 137461c9d..120911c19 100755
--- a/kde/kde/Pkgfile
+++ b/kde/kde/Pkgfile
@@ -2,15 +2,7 @@
# URL: http://www.kde.org/
# Maintainer: NuTyX packager team
# Packager: lesibel at free dot fr
-<<<<<<< HEAD:kde/kde/Pkgfile
-# Depends on: curl, xorg, kdelibs, kdepimlibs, kdeadmin, kdegraphics, kdemultimedia, kdeutils, kdenetwork, kde-l10n-fr, kdebase, kdepim, kdepim-runtime, kdeplasma-addons, kdetoys, kdebindings, phonon, desktop-file-utils, xorg, shared-mime-info, nas, atk, xine-lib, taglib, qimageblitz, pilot-link, gnokii, libical, akonadi, gpgme, boost, lcms, oxygen-icons, soprano, strigi, eigen, eigen, libspectre
-=======
-<<<<<<< HEAD
-# Depends on: curl, xorg, kdelibs, kdepimlibs, kdeadmin, kdegraphics, kdemultimedia, kdeutils, kdenetwork, kde-l10n-fr, kdebase, kdepim, kdepim-runtime, kdeplasma-addons, kdetoys, kdebindings, phonon, desktop-file-utils, xorg, shared-mime-info, nas, atk, xine-lib, taglib, qimageblitz, pilot-link, gnokii, libical, akonadi, gpgme, boost, lcms, oxygen-icons, soprano, strigi, eigen, eigen, libspectre
-=======
-# Depends on: xorg, kdelibs, kdepimlibs, kdeadmin, kdegraphics, kdemultimedia, kdeutils, kdegames, kdenetwork, kde-l10n-fr, kdebase, kdepim, kdeplasma-addons, kdetoys, kdebindings, phonon-xine, k3b, kdesdk, amarok, desktop-file-utils, xorg, shared-mime-info, nas, atk, xine-lib, taglib, qimageblitz, pilot-link, gnokii, libical, akonadi, gpgme, boost, lcms, oxygen-icons, soprano, strigi, eigen, eigen2, gestpkg
->>>>>>> nutyx-2009/master
->>>>>>> lesibel/master:kde/kde/Pkgfile
+# Depends on: curl, xorg, kdelibs, kdepimlibs, kdeadmin, kdegraphics, kdemultimedia, kdeutils, kdenetwork, kde-l10n-fr, kdebase, kdepim, kdepim-runtime, kdeplasma-addons, kdetoys, phonon, desktop-file-utils, shared-mime-info, nas, atk, xine-lib, taglib, qimageblitz, pilot-link, gnokii, libical, akonadi, gpgme, boost, lcms, oxygen-icons, soprano, strigi, eigen, eigen, libspectre
name=kde
version=4.4.0