[Kst] branches/work/kst/portto4

[Peter Kümmel]

SVN commit 1295756 by kuemmel:

Merge branch 'deploy'

Conflicts:
	kst/cmake/CMakeLists.txt

 A             .gitignore  
 M  +132 -49   kst/cmake/3rdparty/CMakeLists.txt  
 M  +33 -22    kst/cmake/CMakeLists.txt  
 M  +26 -8     kst/cmake/modules/KstMacros.cmake  
 M  +24 -0     kst/cmake/src/kst/CMakeLists.txt  
 AM            kst/cmake/src/kst/kst2.sh.cmake  
 M  +19 -6     kst/misc/linux-release.sh  


http://websvn.kde.org/?view=rev&revision=1295756