From 2854de22ecaf8013ec13633e1b21d031c97e3c46 Mon Sep 17 00:00:00 2001
From: Don Ho <don.h@free.fr>
Date: Fri, 4 Sep 2015 20:24:46 +0200
Subject: [PATCH] [RELEASE] Notepad++ release 6.8.3

---
 PowerEditor/bin/change.log         | 5 +++--
 PowerEditor/installer/nppSetup.nsi | 4 ++--
 PowerEditor/src/resource.h         | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index 603e9dd97..3d4147c79 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,10 +1,11 @@
 Notepad++ v6.8.3 bug-fixes:
 
-1.  Fix the crash by using wild card (*) to open files on command line.
+1.  Fix a crash issue by using wild card (*) to open files on command line.
 2.  Fix the problem of display refresh missing on exit.
 3.  Fix plugin shortcut configuration lost problem by using option -noPlugin.
 4.  Fix Norwegian localization bad display and wrong encoding.
-
+5.  Fix functionList display problem under high DPI.
+6.  Fix Norwegian localization bad display and wrong encoding.
 
 
 Included plugins:
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index 8d8303ace..ce2ed2674 100644
--- a/PowerEditor/installer/nppSetup.nsi
+++ b/PowerEditor/installer/nppSetup.nsi
@@ -36,10 +36,10 @@
 ; Define the application name
 !define APPNAME "Notepad++"
 
-!define APPVERSION "6.8.2"
+!define APPVERSION "6.8.3"
 !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
 !define VERSION_MAJOR 6
-!define VERSION_MINOR 82
+!define VERSION_MINOR 83
 
 !define APPWEBSITE "http://notepad-plus-plus.org/"
 
diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h
index bc1e1cc43..292577719 100644
--- a/PowerEditor/src/resource.h
+++ b/PowerEditor/src/resource.h
@@ -26,13 +26,13 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #pragma once
 
-#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.8.2")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.8.3")
 
 
 // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71
 // ex : #define VERSION_VALUE TEXT("5.63\0")
-#define VERSION_VALUE TEXT("6.82\0")
-#define VERSION_DIGITALVALUE 6, 8, 2, 0
+#define VERSION_VALUE TEXT("6.83\0")
+#define VERSION_DIGITALVALUE 6, 8, 3, 0
 
 #ifndef IDC_STATIC
 #define IDC_STATIC    -1