[Fedora-spins] [spin-kickstarts/f20: 1/2] design: added gimp-gap

[Luya Tshimbalanga]

commit eb8823e1d7a756af51883c510cd13bfc0ba0d7cc
Author: Luya Tshimbalanga <luya(a)fedoraproject.org&gt;
Date:   Sun Nov 17 11:46:37 2013 -0800

    design: added gimp-gap

 fedora-live-design-suite.ks |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/fedora-live-design-suite.ks b/fedora-live-design-suite.ks
index f8d7c04..105bf63 100644
--- a/fedora-live-design-suite.ks
+++ b/fedora-live-design-suite.ks
@@ -4,7 +4,7 @@
 # - A Spin targeted towards professional designers
 # Website: http://fedoraproject.org/wiki/Design_Suite
 # Maintainers:
-# - Luya Tshimbalanga <sdz AT fedoraproject DOT org>
+# - Luya Tshimbalanga <luya AT fedoraproject DOT org>
 # - Previous maintainer Sebastian Dziallas
 
 %include fedora-live-desktop.ks
@@ -27,6 +27,8 @@ font-manager
 gimp
 gimp-*-plugin
 gimp-data-extras
+gimp-gap
+gimp-paint-studio
 gimp-high-pass-filter
 gimp-normalmap
 gimp-resynthesizer
@@ -119,22 +121,19 @@ Categories=Graphics;Documentation;
 FOE
 chmod a+x /usr/share/applications/inkscape-course.desktop
 
-<<<<<<< HEAD
-=======
-# Add link to the list of design tutorials
+# Add link to lists of tutorials
 cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
 [Desktop Entry]
 Name=List of design tutorials
-GenericName=Design tutorials
-Comment=List of websites using open source design software
-Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite/Tutorials
+GenericName=List of design tutorials
+Comment=Reference of design related tutorials
+Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite/Tutorials
 Type=Application
 Icon=applications-graphics
 Categories=Graphics;Documentation;
 FOE
 chmod a+x /usr/share/applications/list-design-tutorials.desktop
 
->>>>>>> 6d05550... design: fix link for tutorials
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas