Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Thomas Baumbach 2013-09-18 16:39:01 +02:00
commit 8a5d991f0c

View file

@ -15,7 +15,7 @@ const std::string CLIENT_NAME("Satoshi");
#define CLIENT_VERSION_SUFFIX "-beta"
// Special version string
#define SPECIAL_VERSION_STR "xpm-hp10"
#define SPECIAL_VERSION_STR "xpm-hp11"
// The following part of the code determines the CLIENT_BUILD variable.