Merge branch 'master' into pu/fb-setmode

This commit is contained in:
2017-04-29 22:51:54 +02:00
2 changed files with 2 additions and 1 deletions

View File

@@ -132,6 +132,7 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
channelsChanged = false;
paint_events_index = -2;
CFrameBuffer::getInstance()->OnAfterSetPallette.connect(sigc::mem_fun(this, &CChannelList::ResetModules));
}
CChannelList::~CChannelList()

View File

@@ -41,7 +41,7 @@ using namespace std;
| +--------+ +--------+ +--------+ |
| | item | | item | | item | |
| +--------+ +--------+ +--------+ |
| chn_t_offset |
| chn_b_offset |
+------------------------------------------------------------------------------------+
*/