From: Gavin Andresen <gavinandresen@gmail.com>
Date: Tue, 19 Jun 2012 20:34:10 +0000 (-0400)
Subject: Merge branch '0.6.x' of git://gitorious.org/+bitcoin-stable-developers/bitcoin/bitcoi... 
X-Git-Tag: v0.4.0-unstable~129^2~1
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=23e7583a8c9a0dcee9cbbf3be8bfc453298773f0

Merge branch '0.6.x' of git://gitorious.org/+bitcoin-stable-developers/bitcoin/bitcoind-stable into 0.6.3
---

23e7583a8c9a0dcee9cbbf3be8bfc453298773f0
diff --cc src/key.cpp
index b6c3f28,dab1eed..18b4672
--- a/src/key.cpp
+++ b/src/key.cpp
@@@ -1,14 -1,9 +1,14 @@@
  // Copyright (c) 2009-2012 The Bitcoin developers
  // Distributed under the MIT/X11 software license, see the accompanying
- // file license.txt or http://www.opensource.org/licenses/mit-license.php.
+ // file COPYING or http://www.opensource.org/licenses/mit-license.php.
  
 -#include <openssl/ec.h>
 +#include <map>
 +
  #include <openssl/ecdsa.h>
 +#include <openssl/obj_mac.h>
 +
 +#include "key.h"
 +#include "util.h"
  
  // Generate a private key from just the secret parameter
  int EC_KEY_regenerate_key(EC_KEY *eckey, BIGNUM *priv_key)
diff --cc src/script.cpp
index 56c2e50,9f45302..ccb19c3
--- a/src/script.cpp
+++ b/src/script.cpp
@@@ -1,9 -1,8 +1,9 @@@
  // Copyright (c) 2009-2010 Satoshi Nakamoto
  // Copyright (c) 2009-2012 The Bitcoin developers
  // Distributed under the MIT/X11 software license, see the accompanying
- // file license.txt or http://www.opensource.org/licenses/mit-license.php.
+ // file COPYING or http://www.opensource.org/licenses/mit-license.php.
  #include <boost/foreach.hpp>
 +#include <boost/tuple/tuple.hpp>
  
  using namespace std;
  using namespace boost;
diff --cc src/version.h
index c0ec97d,3b26c8f..9718e75
--- a/src/version.h
+++ b/src/version.h
@@@ -10,10 -10,11 +10,11 @@@
  // client versioning
  //
  
- static const int CLIENT_VERSION_MAJOR       =  0;
- static const int CLIENT_VERSION_MINOR       =  6;
- static const int CLIENT_VERSION_REVISION    =  3;
- static const int CLIENT_VERSION_BUILD       = 0;
+ // These need to be macro's, as version.cpp's voodoo requires it
+ #define CLIENT_VERSION_MAJOR       0
+ #define CLIENT_VERSION_MINOR       6
 -#define CLIENT_VERSION_REVISION    2
 -#define CLIENT_VERSION_BUILD       2
++#define CLIENT_VERSION_REVISION    3
++#define CLIENT_VERSION_BUILD       0
  
  static const int CLIENT_VERSION =
                             1000000 * CLIENT_VERSION_MAJOR