Commit Graph

5366 Commits

Author SHA1 Message Date
Pairi Daiza
fb55b3aef7 + upd: First BETA build after Release v5.20.411.2 2020-04-13 15:43:30 +02:00
Rainer Kottenhoff
b1779437f5
Merge pull request #2218 from rizonesoft/NewFeatures
Merge "New Features" development branch to master
2020-04-13 14:15:35 +02:00
Rainer Kottenhoff
f17a24c5f0
Merge pull request #2217 from RaiKoHoff/NewFeatures_grepWinNP3
New features grep win np3
2020-04-13 14:07:19 +02:00
Rainer Kottenhoff
eb4c095e05 Merge branch 'RC2_DEV' into NewFeatures_grepWinNP3
# Conflicts:
#	Build/Changes.txt
#	Versions/day.txt
#	np3portableapp/_buildname.txt
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
2020-04-13 14:06:14 +02:00
Rainer Kottenhoff
9136faaf27
Merge pull request #2216 from RaiKoHoff/NewFeatures_grepWinNP3
View selection on wrapped long-lines vs. normalizing view
2020-04-13 14:04:54 +02:00
Rainer Kottenhoff
8a7048711f + fix: view selection on wrapped long-lines vs. normalizing view
+ upd: grepWinNP3 version (v2.1.0.4)
2020-04-13 14:03:59 +02:00
Pairi Daiza
243cd470db + upd: Update Changes.txt 2020-04-12 00:29:32 +02:00
Pairi Daiza
fd1a2fd16a
Merge pull request #2213 from hpwamr/mui
+ upd: Versioning files
2020-04-11 23:19:29 +02:00
Pairi Daiza
ef82f1bc90 + upd: Versioning files 2020-04-11 23:05:09 +02:00
Pairi Daiza
eeb463ee12
Update Changes.txt 2020-04-11 22:42:46 +02:00
Pairi Daiza
ef4a7064a0
Update Changes.txt 2020-04-11 21:00:34 +02:00
Derick Payne
cfaaee1253 Updated Afrikaans Translation 2020-04-11 15:53:23 +02:00
Rainer Kottenhoff
51af5d5ce7
Merge pull request #2211 from RaiKoHoff/NewFeatures_grepWinNP3
Update grepWinNP3 (v2.1.0.3 - limit concurrent worker)
2020-04-11 14:58:20 +02:00
Rainer Kottenhoff
50742426d2 + update grepWinNP3 (v2.1.0.3 - limit concurrent worker) 2020-04-11 14:56:43 +02:00
Pairi Daiza
04309dcb0d + chg Update changes.txt 2020-04-11 08:14:07 +02:00
Pairi Daiza
ebdaac4e11
Update Changes.txt 2020-04-11 07:25:11 +02:00
Pairi Daiza
208d288e28
Update Changes.txt 2020-04-11 07:21:33 +02:00
Pairi Daiza
ffd24fb9b8
Merge pull request #2210 from hpwamr/newdev
MUI - Minor corrections in All languages files for grepWinNP3
2020-04-10 14:32:46 +02:00
Pairi Daiza
76aad0b4ab + upd: versioning files and Changes.txt 2020-04-10 14:28:02 +02:00
Pairi Daiza
aec82abc79 MUI - Minor corrections in All languages files for grepWinNP3
+ Translation into es-ES, fr-FR and nl-NL (corrections and adjustments)
2020-04-10 14:26:13 +02:00
Pairi Daiza
c5949622f3 + chg Update changes.txt 2020-04-10 11:04:10 +02:00
Rainer Kottenhoff
0e110e356d
Merge pull request #2209 from RaiKoHoff/NewFeatures_grepWinNP3
Update grepWinNP3 (v2.1.0.2) and master branch merge
2020-04-10 10:18:49 +02:00
Rainer Kottenhoff
d5a541e115
Merge pull request #2208 from RaiKoHoff/RC2_DEV
Change default settings for word/long-line wrapping
2020-04-10 10:16:02 +02:00
Rainer Kottenhoff
69b49d7900 Merge branch 'RC2_DEV' into NewFeatures_grepWinNP3
# Conflicts:
#	Versions/build.txt
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
2020-04-10 10:15:42 +02:00
Rainer Kottenhoff
8d98e589dc + chg: change default settings for word/long-line wrapping 2020-04-10 10:05:29 +02:00
Rainer Kottenhoff
f5ac1d8ea0 Merge remote-tracking branch 'notepad3_orig_rizone/master' into RC2_DEV 2020-04-10 09:22:52 +02:00
Rainer Kottenhoff
c9f138388c + upd: grepWinNP3 (v2.1.0.2) 2020-04-10 09:21:34 +02:00
Rainer Kottenhoff
9e8da22ac7 Merge remote-tracking branch 'notepad3_orig_rizone/NewFeatures' into NewFeatures_grepWinNP3 2020-04-10 09:14:23 +02:00
Pairi Daiza
b488206567
Merge pull request #2207 from hpwamr/newdev
MUI - Add Language and last-translator info to grepWinNP3
2020-04-08 18:20:34 +02:00
Pairi Daiza
30b909f9da MUI - Add Language an last-translator ingo to grepWinNP3
+ upd: Versioning files and Changes.txt
2020-04-08 18:18:07 +02:00
Pairi Daiza
2b37e807a1
Merge pull request #2206 from hpwamr/newdev
+ upd: Maintenance of the acknowledgments list.
2020-04-08 18:14:05 +02:00
Pairi Daiza
78d1f44d5b + upd: Maintenance of the acknowledgments list. 2020-04-08 18:02:28 +02:00
Pairi Daiza
e38cb080bb
Merge pull request #2205 from hpwamr/mui
+ upd: Maintenance of the acknowledgments list.
2020-04-08 17:52:11 +02:00
Pairi Daiza
a11f8fa19e + upd: Maintenance of the acknowledgments list. 2020-04-08 17:39:44 +02:00
RaiKoHoff
f64739630b + add: waifu2x scaled std toolbar bitmaps 2020-04-08 17:13:35 +02:00
Rainer Kottenhoff
4642ed4022
Merge pull request #2204 from RaiKoHoff/NewFeatures_grepWinNP3
Oniguruma & grepWin update
2020-04-08 10:22:09 +02:00
RaiKoHoff
3ff5a9681f + upd: merge RC master (Oniguruma Update) & grepWin v2.0.0.0 changes 2020-04-08 10:00:52 +02:00
RaiKoHoff
e0b3971be2 Merge branch 'RC2_DEV' into NewFeatures_grepWinNP3
# Conflicts:
#	Versions/day.txt
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
2020-04-08 09:12:11 +02:00
RaiKoHoff
8166d4e77e Merge remote-tracking branch 'upstream/NewFeatures' into NewFeatures_grepWinNP3 2020-04-08 09:10:09 +02:00
RaiKoHoff
bd1ac2e0fd Merge remote-tracking branch 'upstream/master' into RC2_DEV 2020-04-08 09:09:03 +02:00
Rainer Kottenhoff
3849bceaea
Merge pull request #2203 from RaiKoHoff/RC2_DEV
Update Oniguruma RegEx engine (v6.9.5 RC1)
2020-04-08 09:08:22 +02:00
Rainer Kottenhoff
90efea9904
Merge branch 'master' into RC2_DEV 2020-04-08 08:59:46 +02:00
RaiKoHoff
b199d98d00 + upd: Oniguruma RegEx engine (v6.9.5 RC1) 2020-04-08 08:57:30 +02:00
Pairi Daiza
d45c38e2ba
Merge pull request #2200 from hpwamr/newdev
+ver: VS2019 version update - VS 16.5.3
2020-04-07 19:49:53 +02:00
Pairi Daiza
dba7f6ce73 +ver: VS2019 version update - VS 16.5.3 2020-04-07 19:48:45 +02:00
Rainer Kottenhoff
6d00e4b0d8
Merge pull request #2196 from RaiKoHoff/NewFeatures_grepWinNP3
New async grepWin version
2020-04-05 13:30:12 +02:00
Rainer Kottenhoff
7d6ed099fa new grepWin version 2020-04-05 12:53:42 +02:00
Rainer Kottenhoff
3fe4ca2c5c
Merge pull request #2194 from RaiKoHoff/NewFeatures_grepWinNP3
New features grepWinNP3
2020-04-03 16:48:14 +02:00
RaiKoHoff
b692de7301 + upd: grepWinNP3 version 2020-04-03 16:46:54 +02:00
RaiKoHoff
9b9e65d016 Merge remote-tracking branch 'upstream/NewFeatures' into NewFeatures_grepWinNP3 2020-04-03 08:13:19 +02:00