[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/tables-uirefactor-mek] /: Merge remote-tracking branch 'origin/master' into tables-uirefac
From:       Marijn Kruisselbrink <mkruisselbrink () kde ! org>
Date:       2012-06-01 0:25:40
Message-ID: 20120601002540.36213A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit cac51f1ef2d51d066be37ada8c55c88a5ed47ad4 by Marijn Kruisselbrink.
Committed on 30/05/2012 at 21:41.
Pushed by mkruisselbrink into branch 'tables-uirefactor-mek'.

Merge remote-tracking branch 'origin/master' into tables-uirefactor-mek

Conflicts:
	sheets/CMakeLists.txt

M  +12   -57   libs/main/KoToolDocker.cpp
M  +1    -1    sheets/CMakeLists.txt
M  +2    -8    sheets/part/Factory.cpp
M  +7    -7    sheets/ui/CellToolBase.cpp
M  +4    -4    sheets/ui/CellToolBase_p.cpp

http://commits.kde.org/calligra/cac51f1ef2d51d066be37ada8c55c88a5ed47ad4

diff --cc sheets/CMakeLists.txt
index 77c25dd,9d8f900..41ce521
--- a/sheets/CMakeLists.txt
+++ b/sheets/CMakeLists.txt
@@@ -330,8 -329,7 +330,8 @@@ install(TARGETS calligrasheets  ${INSTA
  =

  ########### install files ###############
  =

- install( FILES  sheets.rc sheets_readonly.rc sheets.notifyrc DESTINATION =
${DATA_INSTALL_DIR}/sheets)
+ install( FILES  sheets.rc sheets_readonly.rc DESTINATION ${DATA_INSTALL_D=
IR}/sheets)
 +install( FILES  ui/CellToolOptionWidgets.xml DESTINATION ${DATA_INSTALL_D=
IR}/sheets)
  install( FILES  sheetspart.desktop DESTINATION ${SERVICES_INSTALL_DIR})
  install( PROGRAMS  sheets.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
  install( FILES  sheets.kcfg DESTINATION ${KCFG_INSTALL_DIR} )

[prev in list] [next in list] [prev in thread] [next in thread]