Merge remote-tracking branch 'Notepad3_upstream_Rizone/master'

This commit is contained in:
Rainer Kottenhoff 2018-01-02 07:43:48 +01:00
commit c948a37927
5 changed files with 7 additions and 7 deletions

View File

@ -33,7 +33,7 @@ try
{
$Major = 3
$Minor = [int]$(Get-Date -format yy)
$Revis = [int]$(Get-Date -format Mdd)
$Revis = [int]$(Get-Date -format MMdd)
if ($AppVeyorEnv) {
$Build = [int]($env:appveyor_build_number)
}

View File

@ -1 +1 @@
783
795

View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="3.17.1228.783"
version="3.18.0102.795"
type="win32"
/>
<description>Notepad3</description>

View File

@ -4,8 +4,8 @@
// //
// //////////////////////////////////////////////////////////
#define VERSION_MAJOR 3
#define VERSION_MINOR 17
#define VERSION_REV 1228
#define VERSION_BUILD 783
#define VERSION_MINOR 18
#define VERSION_REV 0102
#define VERSION_BUILD 795
#define SCINTILLA_VER 402
#define ONIGMO_REGEX_VER 6.1.3

View File

@ -57,7 +57,7 @@ goto:EOF
for /f "tokens=2 delims==" %%a in ('
wmic OS Get localdatetime /value
') do set "dt=%%a"
set "YY=%dt:~2,2%" & set "YYYY=%dt:~0,4%" & set "MM=%dt:~4,2%" & set "DD=%dt:~6,2%"
set "YY=%dt:~2,2%" & set "YYYY=%dt:~0,4%" & set "MM=%dt:~5,1%" & set "DD=%dt:~6,2%"
set "HH=%dt:~8,2%" & set "Min=%dt:~10,2%" & set "Sec=%dt:~12,2%"
::set "datestamp=%YYYY%%MM%%DD%" & set "timestamp=%HH%%Min%%Sec%"
::set "fullstamp=%YYYY%-%MM%-%DD%_%HH%-%Min%-%Sec%"