Diffusion KInfoCenter a65848689ee4

Merge branch 'Plasma/5.18'
a65848689ee4
Actions

Authored by sitter on Jan 30 2020, 2:44 PM.

Tags

None

Subscribers

None

Description

Merge branch 'Plasma/5.18'

Details

Committed

Jan 30 2020, 2:44 PM

Parents

R102:43cd7a26f31a: remove all platform conditionals not pertaining to linux or *bsd
R102:346a69b62108: Merge branch 'Plasma/5.18'

Branches

Unknown

Tags

Unknown

sitter committed R102:a65848689ee4: Merge branch 'Plasma/5.18' (authored by sitter).Jan 30 2020, 2:44 PM

Merged Changes

	Commit			Author	Details	Committed
	43cd7a26f31a		D27030	sitter	remove all platform conditionals not pertaining to linux or *bsd	Jan 30 2020

Changes (21)

				Path	Packages
	M			CMakeLists.txt
	M			Modules/CMakeLists.txt
	M			Modules/base/CMakeLists.txt
	D			Modules/base/info_aix.cpp
	D			Modules/base/info_hpux.cpp
	D			Modules/base/info_osx.cpp
	D			Modules/base/info_sgi.cpp
	D			Modules/base/info_solaris.cpp
	M			Modules/base/os_current.cpp
	M			Modules/base/os_current.h
	M			Modules/memory/base.h
	M			Modules/memory/memory.cpp
	D			Modules/memory/memory_hpux.cpp
	D			Modules/memory/memory_osx.cpp
	D			Modules/memory/memory_sgi.cpp
	D			Modules/memory/memory_solaris.cpp
	D			Modules/memory/memory_tru64.cpp
	M			Modules/memory/physicalMemoryChart.cpp
	M			Modules/nics/nic.cpp
	M			Modules/pci/CMakeLists.txt
	M			kcontrol/menus/CMakeLists.txt

R102:a65848689ee4

CMakeLists.txt

Loading...

Modules/CMakeLists.txt

Loading...

Modules/base/CMakeLists.txt

Loading...

Modules/base/info_aix.cpp

Loading...

Modules/base/info_hpux.cpp

Loading...

Modules/base/info_osx.cpp

Loading...

Modules/base/info_sgi.cpp

Loading...

Modules/base/info_solaris.cpp

Loading...

Modules/base/os_current.cpp

Loading...

Modules/base/os_current.h

Loading...

Modules/memory/base.h

Loading...

Modules/memory/memory.cpp

Loading...

Modules/memory/memory_hpux.cpp

Loading...

Modules/memory/memory_osx.cpp

Loading...

Modules/memory/memory_sgi.cpp

Loading...

Modules/memory/memory_solaris.cpp

Loading...

Modules/memory/memory_tru64.cpp

Loading...

Modules/memory/physicalMemoryChart.cpp

Loading...

Modules/nics/nic.cpp

Loading...

Modules/pci/CMakeLists.txt

Loading...

kcontrol/menus/CMakeLists.txt

Loading...