Frank Celler b5905a293b Merge remote-tracking branch 'origin/1.4' into devel ... Conflicts: CHANGELOG Documentation/RefManual/Actions.md Documentation/UserManual/Foxx.md Documentation/UserManual/UserManual.md lib/ProgramOptions/program-options.c		2014-01-25 22:30:04 +01:00
..
program-options.c	Merge remote-tracking branch 'origin/1.4' into devel	2014-01-25 22:30:04 +01:00
program-options.h	added variables	2013-10-27 10:33:14 +01:00