Fiff Simulator cfg
set file to fiff default sample data
frequency spectrum settings
show frequency spectrum settings widget
frequency spectrum section
channel scaling
rtmsaw channel scaling
channel scaling
scaling edit
channel scaling and plot reversal
resolved conflicts
Merge branch 'master' of git://github.com/liminsun/mne-cpp

Conflicts:
	applications/mne_x_libs/xDisp/frequencyspectrumwidget.cpp
	applications/mne_x_libs/xDisp/frequencyspectrumwidget.h
Adapt to the varied frequency band for spectrum display.