From 5e401c3f4e8b6745a0a2361fbe81335fb1a11fcf Mon Sep 17 00:00:00 2001
From: jed <yep@>
Date: Sat, 14 Jul 2012 20:54:12 -0700
Subject: [PATCH 1/3] .

---
 src/Amount.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Amount.cpp b/src/Amount.cpp
index 068e1f8e43..f6342ac0e9 100644
--- a/src/Amount.cpp
+++ b/src/Amount.cpp
@@ -1032,7 +1032,7 @@ BOOST_AUTO_TEST_CASE( CurrencyMulDivTests )
 	// convertToDisplayAmount, convertToInternalAmount, getRate, getClaimed, and getNeeded
 
 	uint160 c(1);
-	if (STAmount::getRate(STAmount(1), STAmount(10)) != (((100ul-14)<<(64-8))|1000000000000000ul))
+	if (STAmount::getRate(STAmount(1), STAmount(10)) != (((100ul-14)<<(64-8))|1000000000000000ull))
 		BOOST_FAIL("STAmount getrate fail");
 	if (STAmount::getRate(STAmount(10), STAmount(1)) != (((100ul-16)<<(64-8))|1000000000000000ul))
 		BOOST_FAIL("STAmount getrate fail");

From dcc7025b41a8b11883b5a2f80e6ef5f76e5830a7 Mon Sep 17 00:00:00 2001
From: jed <yep@>
Date: Mon, 16 Jul 2012 15:12:45 -0700
Subject: [PATCH 2/3] .

---
 src/Amount.cpp    | 2 +-
 src/RPCServer.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Amount.cpp b/src/Amount.cpp
index 0e64fdf20e..a5ba86d145 100644
--- a/src/Amount.cpp
+++ b/src/Amount.cpp
@@ -1031,7 +1031,7 @@ BOOST_AUTO_TEST_CASE( CurrencyMulDivTests )
 	// convertToDisplayAmount, convertToInternalAmount, getRate, getClaimed, and getNeeded
 
 	uint160 c(1);
-	if (STAmount::getRate(STAmount(1), STAmount(10)) != (((100ul-14)<<(64-8))|1000000000000000ull))
+	if (STAmount::getRate(STAmount(1), STAmount(10)) != (((100ul-14)<<(64-8))|1000000000000000ul))
 		BOOST_FAIL("STAmount getrate fail");
 	if (STAmount::getRate(STAmount(10), STAmount(1)) != (((100ul-16)<<(64-8))|1000000000000000ul))
 		BOOST_FAIL("STAmount getrate fail");
diff --git a/src/RPCServer.cpp b/src/RPCServer.cpp
index 39ecbba081..d6857c4b67 100644
--- a/src/RPCServer.cpp
+++ b/src/RPCServer.cpp
@@ -1385,7 +1385,7 @@ Json::Value RPCServer::doSend(const Json::Value& params)
 		{
 			// Not enough native currency.
 
-			Log(lsINFO) << "doSend: Insufficent funds: src=" << saSrcAmount.getText() << " dst=" << saDstAmount.getText();
+			Log(lsINFO) << "doSend: Insufficient funds: src=" << saSrcAmount.getText() << " dst=" << saDstAmount.getText();
 
 			return RPCError(rpcINSUF_FUNDS);
 		}

From 0f554c1c590487c32afa542b2721492bf341ea61 Mon Sep 17 00:00:00 2001
From: jed <yep@>
Date: Mon, 16 Jul 2012 15:36:54 -0700
Subject: [PATCH 3/3] compile on windows

---
 newcoin.vcxproj         | 1 +
 newcoin.vcxproj.filters | 3 +++
 src/Amount.cpp          | 8 +++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/newcoin.vcxproj b/newcoin.vcxproj
index e9790d155a..58d9966419 100644
--- a/newcoin.vcxproj
+++ b/newcoin.vcxproj
@@ -116,6 +116,7 @@
     <ClCompile Include="src\LedgerMaster.cpp" />
     <ClCompile Include="src\LedgerNode.cpp" />
     <ClCompile Include="src\LedgerProposal.cpp" />
+    <ClCompile Include="src\LedgerTiming.cpp" />
     <ClCompile Include="src\Log.cpp" />
     <ClCompile Include="src\main.cpp" />
     <ClCompile Include="src\NetworkOPs.cpp" />
diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters
index 7de6413e29..168f3736bb 100644
--- a/newcoin.vcxproj.filters
+++ b/newcoin.vcxproj.filters
@@ -264,6 +264,9 @@
     <ClCompile Include="websocketpp\src\sha1\sha1.cpp">
       <Filter>Source Files\websocketpp</Filter>
     </ClCompile>
+    <ClCompile Include="src\LedgerTiming.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="KnownNodeList.h">
diff --git a/src/Amount.cpp b/src/Amount.cpp
index a5ba86d145..f02acf78b8 100644
--- a/src/Amount.cpp
+++ b/src/Amount.cpp
@@ -836,11 +836,17 @@ Json::Value STAmount::getJson(int) const
 {
 	Json::Value elem(Json::objectValue);
 
-	elem["value"]		= getText();
+	
 
 	// This is a hack, many places don't specify a currency.  STAmount is used just as a value.
 	if (!mIsNative)
+	{
+		elem["value"]		= getText();
 		elem["currency"]	= getCurrencyHuman();
+	}else
+	{
+		elem=getText();
+	}
 
 	return elem;
 }