Merge branch 'master' of https://github.com/gridcoin/Gridcoin-Research

CHANGELOG.md

@@ -4,8 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased]
+## [3.5.9.0] - 2017-06-05
 ### Added
+ - Added execute unspentreport (shows proof of unspent coins in wallet).
  - Add RPC commands for changing debug flags: debug, debugnet, debug2, debug3,
    debug4, debug5, debug10. #309 (@Foggyx420).
  - Add support for themes via stylesheets, #233 (@skcin).
@@ -17,6 +18,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
    #175 (@fooforever).
 
 ### Changed
+ - Upgraded security on voting system - voting proof of balance and proof of
+   magnitude.
+ - Security enhancement (@tomasbrod)
  - Wallet overview cleanup, #233 (@skcin)
    - The main overview page is now cleaner, more structured and holds more of
      the recent transactions.

gridcoinresearch.pro

@@ -6,15 +6,12 @@ DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
 CONFIG += no_include_pwd thread c++11 exceptions concurrent
 QT += core gui network
 
-win32 
-{
+win32 {
     DEFINES += _WIN32_WINNT=0x0501 WINVER=0x0501
-    lessThan(QT_VERSION, 5.0.0) 
-    {
+    lessThan(QT_VERSION, 5.0.0) {
         CONFIG += qaxcontainer
     } 
-    else 
-    {
+    else {
         QT += axcontainer
     }
 

src/makefile.osx

@@ -88,19 +88,20 @@ OBJS= \
     obj/script.o \
     obj/sync.o \
     obj/util.o \
-	obj/upgrader.o \
+    obj/upgrader.o \
     obj/wallet.o \
     obj/walletdb.o \
     obj/noui.o \
     obj/kernel.o \
     obj/pbkdf2.o \
     obj/scrypt.o \
-    obj/scrypt-arm.o \
     obj/scrypt-x86.o \
     obj/scrypt-x86_64.o \
     obj/cpid.o \
     obj/upgrader.o \
-    obj/block.o
+    obj/block.o \
+    obj/beacon.o \
+    obj/boinc.o
 
 ifndef USE_UPNP
 	override USE_UPNP = -