summaryrefslogtreecommitdiffstats
path: root/kde
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-02-11 23:08:53 +0100
committertnut <thierryn1 at hispeed dot ch>2010-02-11 23:08:53 +0100
commit6cb0fedc123ce8e8601cca011058d7eaa924814b (patch)
treec8789cc8a2255c164515a7204953010e3dbbcfe0 /kde
parent01da585771d3cf3f44561c2f953448813a5747ac (diff)
parent98e0db6e8a6b2d43d064af1ab36c763389d1bf41 (diff)
downloadnutyx-pakxe-6cb0fedc123ce8e8601cca011058d7eaa924814b.tar.gz
nutyx-pakxe-6cb0fedc123ce8e8601cca011058d7eaa924814b.tar.bz2
nutyx-pakxe-6cb0fedc123ce8e8601cca011058d7eaa924814b.tar.xz
nutyx-pakxe-6cb0fedc123ce8e8601cca011058d7eaa924814b.zip
kde
Diffstat (limited to 'kde')
-rwxr-xr-xkde/kde/Pkgfile8
1 files changed, 8 insertions, 0 deletions
diff --git a/kde/kde/Pkgfile b/kde/kde/Pkgfile
index 80629df24..137461c9d 100755
--- a/kde/kde/Pkgfile
+++ b/kde/kde/Pkgfile
@@ -2,7 +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