[rkward/frameworks] rkward: Merge branch 'master' into frameworks

[Thomas Friedrichsmeier]

Git commit ad2aebc539a8600db4c5e5f42c319ce5d1592fff by Thomas Friedrichsmeier.
Committed on 03/06/2015 at 12:21.
Pushed by tfry into branch 'frameworks'.

Merge branch 'master' into frameworks

Conflicts:
	rkward/dataeditor/twintable.h

M  +21   -4    rkward/dataeditor/twintable.cpp
M  +3    -1    rkward/dataeditor/twintable.h
M  +37   -28   rkward/plugin/rkvarslot.cpp

http://commits.kde.org/rkward/ad2aebc539a8600db4c5e5f42c319ce5d1592fff

diff --cc rkward/dataeditor/twintable.h
index 6a803b2,89526b4..3c97830
--- a/rkward/dataeditor/twintable.h
+++ b/rkward/dataeditor/twintable.h
@@@ -92,18 -92,20 +92,20 @@@ protected
  	TwinTableMember* metaview;
  	TwinTableMember* dataview;
  
 -	KAction* action_insert_col_left;
 -	KAction* action_delete_col;
 -	KAction* action_insert_row_above;
 -	KAction* action_delete_row;
 -	KAction* action_delete_rows;
 -	KAction* action_enable_editing;
 -	KAction* action_tb_lock_editing;
 -	KAction* action_tb_unlock_editing;
 -	KAction* action_show_rownames;
 -	KAction* editCut;
 -	KAction* editCopy;
 -	KAction* editPaste;
 -	KAction* editPasteToSelection;
 -	KAction* editPasteToTable;
 +	QAction* action_insert_col_left;
 +	QAction* action_delete_col;
 +	QAction* action_insert_row_above;
 +	QAction* action_delete_row;
 +	QAction* action_delete_rows;
 +	QAction* action_enable_editing;
++	QAction* action_tb_lock_editing;
++	QAction* action_tb_unlock_editing;
 +	QAction* action_show_rownames;
 +	QAction* editCut;
 +	QAction* editCopy;
 +	QAction* editPaste;
 +	QAction* editPasteToSelection;
 +	QAction* editPasteToTable;
  
  	QActionGroup* edit_actions;