Pulling latest update from original master

.gitignore

@@ -1,60 +1,63 @@
-#-------------------------------------------------------------------------------
-# NppExec
-NppExec_Manual.chm
-*.zip
-
-#-------------------------------------------------------------------------------
-# VisualStudio
-
-#-- User-specific files
-*.suo
-*.user
-*.sln.docstates
-
-#-- Build results
-[Dd]ebug/
-[Rr]elease/
-x64/
-x86/
-#[Bb]in/
-[Oo]bj/
-*.pdb
-
-#-- Visual C++ cache files
-.vs/
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.vc.db
-
-#-- Backup & report files from converting an old project file to a newer
-#   Visual Studio version. Backup files are not needed, because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-#-- Others
-*_i.c
-*_p.c
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-.builds
-*.pidb
+#-------------------------------------------------------------------------------
+# NppExec
+NppExec_Manual.chm
+*.zip
+
+#-------------------------------------------------------------------------------
+# VisualStudio
+
+#-- User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+#-- Build results
+[Dd]ebug/
+/NppExec/[Rr]elease/*
+!/NppExec/[Rr]elease/NppExec/*
+x64/
+x86/
+#[Bb]in/
+[Oo]bj/
+*.pdb
+*.lib
+
+#-- Visual C++ cache files
+.vs/
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.vc.db
+
+#-- Backup & report files from converting an old project file to a newer
+#   Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+#-- Others
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.tlog
+.builds
+*.pidb