Notepad3/scionigmo
Rainer Kottenhoff 02a55e7881 Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_NewFeatures
# Conflicts:
#	Versions/build.txt
#	np3portableapp/_buildname.txt
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
2019-01-02 20:32:47 +01:00
..
OnigmoRegExEngine.cxx Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_NewFeatures 2019-01-02 20:32:47 +01:00