about
Merge branch 'master' of github.com:benapetr/KernelHacker

Conflicts:
	KernelHacker/kernelparameter.cpp
	KernelHacker/mainwindow.ui