Notepad3/np3portableapp/Notepad3Portable
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
..
App Merge branch 'Dev_Fixes4Release' into Dev_AccelKeys 2018-11-13 08:43:07 +01:00
Other Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_NewFeatures 2019-01-02 20:32:47 +01:00
help.html + chg: preparations for PortableApps.com distribution 2018-11-08 17:50:11 +01:00