Permalink
Browse files

Version bump and new year changes

  • Loading branch information...
kr105 committed Jan 4, 2014
1 parent cedd0a0 commit 7bd0f390f9268ffb8eaa4b33416139b6696bb248
Showing with 24 additions and 18 deletions.
  1. +1 −1 COPYING
  2. +2 −2 README.md
  3. +1 −1 bitcoin-qt.pro
  4. +1 −1 doc/README.md
  5. +1 −1 doc/README_windows.txt
  6. +5 −0 doc/release-notes.md
  7. +1 −1 share/qt/Info.plist
  8. +3 −3 share/setup.nsi
  9. +1 −1 src/bitcoinrpc.h
  10. +3 −3 src/clientversion.h
  11. +2 −1 src/main.cpp
  12. +1 −1 src/net.cpp
  13. +1 −1 src/qt/aboutdialog.cpp
  14. +1 −1 src/rpcmining.cpp
View
@@ -1,6 +1,6 @@
Copyright (c) 2009-2013 Bitcoin Developers
Copyright (c) 2011-2013 Litecoin Developers
-Copyright (c) 2013 Catcoin Developers
+Copyright (c) 2013-2014 Catcoin Developers
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
View
@@ -5,7 +5,7 @@ http://www.catcoin.pw
Copyright (c) 2009-2013 Bitcoin Developers
Copyright (c) 2011-2013 Litecoin Developers
-Copyright (c) 2013 Catcoin Developers
+Copyright (c) 2013-2014 Catcoin Developers
What is Catcoin?
----------------
@@ -16,7 +16,7 @@ blockchain parameters as Bitcoin:
- 10 minutes block targets
- Subsidy halves in 210k blocks
- 21 million total coins
- - 2016 blocks to retarget difficulty
+ - 36 blocks to retarget difficulty
For more information, as well as an immediately useable, binary version of
the Catcoin client sofware, see http://www.catcoin.pw.
View
@@ -1,7 +1,7 @@
TEMPLATE = app
TARGET = catcoin-qt
macx:TARGET = "Catcoin-Qt"
-VERSION = 0.8.6.2
+VERSION = 0.8.7
INCLUDEPATH += src src/json src/qt
QT += core gui network
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
View
@@ -3,7 +3,7 @@ Catcoin 0.8.x BETA
Copyright (c) 2009-2013 Bitcoin Developers
Copyright (c) 2011-2013 Litecoin Developers
-Copyright (c) 2013 Catcoin Developers
+Copyright (c) 2013-2014 Catcoin Developers
Distributed under the MIT/X11 software license, see the accompanying
file COPYING or http://www.opensource.org/licenses/mit-license.php.
View
@@ -2,7 +2,7 @@ Catcoin 0.8.x BETA
Copyright (c) 2009-2013 Bitcoin Developers
Copyright (c) 2011-2013 Litecoin Developers
-Copyright (c) 2013 Catcoin Developers
+Copyright (c) 2013-2014 Catcoin Developers
Distributed under the MIT/X11 software license, see the accompanying
file COPYING or http://www.opensource.org/licenses/mit-license.php.
This product includes software developed by the OpenSSL Project for use in
View
@@ -1,3 +1,8 @@
+0.8.7 changes
+=============
+
+- Hard for at block 20,290 to change retarget interval to 36 blocks and reset difficulty to 16
+
0.8.6.2 changes
=============
View
@@ -3,7 +3,7 @@
<plist version="0.9">
<dict>
<key>CFBundleIconFile</key>
- <string>catcoin.icns</string>
+ <string>bitcoin.icns</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleGetInfoString</key>
View
@@ -5,7 +5,7 @@ SetCompressor /SOLID lzma
# General Symbol Definitions
!define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 0.8.6.2
+!define VERSION 0.8.7
!define COMPANY "Catcoin project"
!define URL http://www.catcoin.pw/
@@ -45,13 +45,13 @@ Var StartMenuGroup
!insertmacro MUI_LANGUAGE English
# Installer attributes
-OutFile catcoin-0.8.6.2-win32-setup.exe
+OutFile catcoin-0.8.7-win32-setup.exe
InstallDir $PROGRAMFILES\Catcoin
CRCCheck on
XPStyle on
BrandingText " "
ShowInstDetails show
-VIProductVersion 0.8.6.2
+VIProductVersion 0.8.7
VIAddVersionKey ProductName Catcoin
VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}"
View
@@ -1,6 +1,6 @@
// Copyright (c) 2010 Satoshi Nakamoto
// Copyright (c) 2009-2012 The Bitcoin developers
-// Copyright (c) 2013 The Catcoin developers
+// Copyright (c) 2013-2014 The Catcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
View
@@ -8,15 +8,15 @@
// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 0
#define CLIENT_VERSION_MINOR 8
-#define CLIENT_VERSION_REVISION 6
-#define CLIENT_VERSION_BUILD 2
+#define CLIENT_VERSION_REVISION 7
+#define CLIENT_VERSION_BUILD 0
// Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true
// Copyright year (2009-this)
// Todo: update this when changing our copyright comments in the source
-#define COPYRIGHT_YEAR 2013
+#define COPYRIGHT_YEAR 2014
// Converts the parameter X to a string after macro replacement on X has been performed.
// Don't merge these into one macro!
View
@@ -1,5 +1,6 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2012 The Bitcoin developers
+// Copyright (c) 2013-2014 The Catcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -1119,7 +1120,7 @@ unsigned int static GetNextWorkRequired(const CBlockIndex* pindexLast, const CBl
return nProofOfWorkLimit;
// Starting from block 20,290 the network diff was set to 16
- // and the retarget interval was changed to 36
+ // and the retarget interval was changed to 36
if(pindexLast->nHeight < forkBlock) {
nTargetTimespanLocal = nTargetTimespanOld;
nIntervalLocal = nIntervalOld;
View
@@ -1,6 +1,6 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2012 The Bitcoin developers
-// Copyright (c) 2013 The Catcoin developers
+// Copyright (c) 2013-2014 The Catcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
View
@@ -6,7 +6,7 @@
// Copyright year (2009-this)
// Todo: update this when changing our copyright comments in the source
-const int ABOUTDIALOG_COPYRIGHT_YEAR = 2013;
+const int ABOUTDIALOG_COPYRIGHT_YEAR = 2014;
AboutDialog::AboutDialog(QWidget *parent) :
QDialog(parent),
View
@@ -1,6 +1,6 @@
// Copyright (c) 2010 Satoshi Nakamoto
// Copyright (c) 2009-2012 The Bitcoin developers
-// Copyright (c) 2013 The Catcoin developers
+// Copyright (c) 2013-2014 The Catcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

0 comments on commit 7bd0f39

Please sign in to comment.