Diffusion KWin 4f494d8b8e9c

Merge branch 'kwin/active-kconf_update'
4f494d8b8e9c
Actions

Authored by lvsouza on Apr 23 2012, 8:32 PM.

Description

Merge branch 'kwin/active-kconf_update'

Details

Committed

lvsouza

Apr 23 2012, 8:32 PM

Parents

R108:f2445ca631e6: Fix compilation.
R108:5ede39d2bcc5: Merge branch 'master' of git://anongit.kde.org/kde-workspace

Branches

Unknown

Tags

Unknown

lvsouza committed R108:4f494d8b8e9c: Merge branch 'kwin/active-kconf_update' (authored by lvsouza).Apr 23 2012, 8:32 PM

Merged Changes

Commit	Author	Details	Committed
f2445ca631e6	lvsouza	Fix compilation.	Apr 18 2012
612f1d1c6a74	lvsouza	Add kwin/data/active (kconf_update configuration for Plasma Active).	Apr 18 2012
9f5e62ae2fe8	lvsouza	Move kwin/data to kwin/data/desktop so that I can add kwin/data/active.	Apr 18 2012

Changes (30)

		Path
P	(dir)	data/ Copied to data/desktop
P		data/CMakeLists.txt Copied to data/desktop/CMakeLists.txt
A	(dir)	data/active/
A		data/active/CMakeLists.txt
A		data/active/kwin_update_tabbox_qml_settings_active.upd
P		data/active/update_tabbox_qml_settings_active.cpp Copied from data/update_tabbox_settings.cpp
P	(dir)	data/desktop/ Copied from data
P		data/desktop/CMakeLists.txt Copied from data/CMakeLists.txt
V		data/{desktop ← }/fsp_workarounds_1.kwinrules
V		data/{desktop ← }/kwin_fsp_workarounds_1.upd
V		data/{desktop ← }/kwin_remove_delay_focus.sh
V		data/{desktop ← }/kwin_remove_delay_focus.upd
V		data/{desktop ← }/kwin_remove_effects.upd
V		data/{desktop ← }/kwin_update_tabbox_qml_settings.upd
V		data/{desktop ← }/kwin_update_tabbox_settings.upd
V		data/{desktop ← }/pop.wav
V		data/{desktop ← }/update_default_rules.cpp
V		data/{desktop ← }/update_tabbox_qml_settings.cpp
V		data/{desktop ← }/update_tabbox_settings.cpp
V		data/{ → desktop}/fsp_workarounds_1.kwinrules
V		data/{ → desktop}/kwin_fsp_workarounds_1.upd
V		data/{ → desktop}/kwin_remove_delay_focus.sh
V		data/{ → desktop}/kwin_remove_delay_focus.upd
V		data/{ → desktop}/kwin_remove_effects.upd
V		data/{ → desktop}/kwin_update_tabbox_qml_settings.upd
V		data/{ → desktop}/kwin_update_tabbox_settings.upd
V		data/{ → desktop}/pop.wav
V		data/{ → desktop}/update_default_rules.cpp
V		data/{ → desktop}/update_tabbox_qml_settings.cpp
P		data/update_tabbox_settings.cpp Deleted after being copied to multiple locations: data/active/update_tabbox_qml_settings_active.cpp data/desktop/update_tabbox_settings.cpp