merge fix
This commit is contained in:
parent
578d3c005d
commit
4afe5ffc1c
1 changed files with 1 additions and 0 deletions
|
@ -442,6 +442,7 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
|
|||
"<p>Peter L. Jones (<a href=""https://github.com/pljones"">pljones</a>)</p>"
|
||||
"<p>Jonathan Baker-Bates (<a href=""https://github.com/gilgongo"">gilgongo</a>)</p>"
|
||||
"<p>Daniele Masato (<a href=""https://github.com/doloopuntil"">doloopuntil</a>)</p>"
|
||||
"<p>Martin Schilde (<a href=""https://github.com/geheimerEichkater"">geheimerEichkater</a>)</p>"
|
||||
"<p>Simon Tomlinson (<a href=""https://github.com/sthenos"">sthenos</a>)</p>"
|
||||
"<p>Marc jr. Landolt (<a href=""https://github.com/braindef"">braindef</a>)</p>"
|
||||
"<p>Olivier Humbert (<a href=""https://github.com/trebmuh"">trebmuh</a>)</p>"
|
||||
|
|
Loading…
Reference in a new issue