resolve conflicts on merge
This commit is contained in:
@@ -292,6 +292,7 @@ Doxygen files have been created to generate a complete Users Guide for version 2
|
|||||||
(In alphabetical order)
|
(In alphabetical order)
|
||||||
- Demetrios Eliades
|
- Demetrios Eliades
|
||||||
- Sam Hatchett
|
- Sam Hatchett
|
||||||
|
- Abel Heinsbroek
|
||||||
- Marios Kyriakou
|
- Marios Kyriakou
|
||||||
- Lewis Rossman
|
- Lewis Rossman
|
||||||
- Elad Salomons
|
- Elad Salomons
|
||||||
|
|||||||
Reference in New Issue
Block a user