summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xkde/kde/Pkgfile4
1 files changed, 4 insertions, 0 deletions
diff --git a/kde/kde/Pkgfile b/kde/kde/Pkgfile
index a1ed48785..137461c9d 100755
--- a/kde/kde/Pkgfile
+++ b/kde/kde/Pkgfile
@@ -2,11 +2,15 @@
# 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
name=kde
version=4.4.0