Merge branch '3.0-Release' of https://github.com/project64/project64 into 3.0-Release

CHANGELOG.md

@@ -1,16 +1,18 @@
-Android Release 9:
+Version 3.0
-- Add ability to change screen res
+- GLideN64 has been added and you can select it as the default plugin in the welcome screen
-- Fix multiple pause/resume
-- minor bug fixes
-
-Windows 2.4
-- Build with v2015
-- fixed fpu issue - Indiana Jones (#76) 
-- Fix bug in key assignment (#1309)
-- Add Shygoo's debugger code
 - New audio plugin
-- large address aware
+- New input plugin
+- Added enhancements functionality
+- Cheat system has been rebuilt from the ground up
 - Ability to change defaults
-- Add GlideN64
+- Saves in their own unique directory
-- Add New controller plugin
+- Added Shygoo's debugger code
-- Saves in unique directory
+- Fixed FPU issue
+- Fix issues in key assignment
+- Large address aware
+- Default compiler is now Visual Studio 2015
+
+Android Release 9:
+- Add ability to change screen resolution
+- Fix multiple pause/resume
+- Minor bug fixes

Source/Project64/UserInterface/Debugger/MemoryScanner.cpp

@@ -141,8 +141,7 @@ CScanResult::CScanResult(AddressType addressType, DisplayFormat displayFormat) :
     m_AddressType(addressType),
     m_Address(0),
     m_DisplayFormat(displayFormat),
-    m_bSelected(false),
+    m_bSelected(false)
-    m_Description(nullptr)
 {
 }