Merge branch 'next' of ssh://lsleditor.git.sourceforge.net/gitroot/lsleditor/lsleditor into next
Conflicts: trunk/Resource/ReleaseNotes.htm
This commit is contained in:
commit
f946959943
Conflicts: trunk/Resource/ReleaseNotes.htm