Merge branch 'master' into Branch_c89390eb0cf49b6a496733d071b395ba7bb40e21

Conflicts:
	src/Config.cpp
This commit is contained in:
jed
2012-10-27 10:22:54 -07:00

View File

@@ -35,7 +35,7 @@
#define SECTION_VALIDATORS "validators"
#define SECTION_VALIDATORS_SITE "validators_site"
// Fees are in XNB.
// Fees are in XNS.
#define DEFAULT_FEE_DEFAULT 10
#define DEFAULT_FEE_ACCOUNT_CREATE 1000*SYSTEM_CURRENCY_PARTS
#define DEFAULT_FEE_NICKNAME_CREATE 1000