Merge branch 'master' into gtk3-merge-master-b8eb349

This commit is contained in:
Morgan Hardwood
2016-10-10 23:07:41 +02:00
166 changed files with 15898 additions and 2285 deletions

View File

@@ -96,7 +96,7 @@ protected:
public:
History (bool bookmarkSupport = true);
explicit History (bool bookmarkSupport = true);
void setProfileChangeListener (ProfileChangeListener* tpc_)
{