Merge commit 'pull/origin/155'

Conflicts:
	CMakeLists.txt
This commit is contained in:
scrawl 2014-06-10 23:24:16 +02:00
commit 7eee0855f7

View file

@ -416,7 +416,7 @@ IF(NOT WIN32 AND NOT APPLE)
ENDIF(BUILD_OPENCS)
# Install licenses
INSTALL(FILES "DejaVu Font License.txt" DESTINATION "${LICDIR}" )
INSTALL(FILES "docs/license/DejaVu Font License.txt" DESTINATION "${LICDIR}" )
INSTALL(FILES "extern/shiny/License.txt" DESTINATION "${LICDIR}" RENAME "Shiny License.txt" )
# Install icon and desktop file