Merge remote branch 'refs/remotes/svn/trunk' into svn

diff --git a/README.md b/README.md
new file mode 100644 (file)
index 0000000..4c8475c
--- /dev/null
+++ b/README.md
@@ -0,0 +1,12 @@
+Gavin's Bitcoin patches
+=======================
+
+Branches here:
+
+* svn : up-to-date mirror of the 'production' Bitcoin (from http://sourceforge.net/projects/bitcoin/).
+* monitorreceived : Implements monitortransaction/monitorblocks/gettransaction/getblock RPC commands.
+* listtransactions: Implements new JSON-RPC command "listtransactions" (from jgarzik)
+* refundtransaction : Implements new JSON-RPC command "refundtransaction"
+* master : All of the above, merged together.
+
+Code is hosted at github: http://github.com/gavinandresen/bitcoin-git

diff --git a/cryptopp/obj/.gitignore b/cryptopp/obj/.gitignore
new file mode 100644 (file)
index 0000000..d6b7ef3
--- /dev/null
+++ b/cryptopp/obj/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore

diff --git a/obj/.gitignore b/obj/.gitignore
new file mode 100644 (file)
index 0000000..d6b7ef3
--- /dev/null
+++ b/obj/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore

diff --git a/obj/nogui/.gitignore b/obj/nogui/.gitignore
new file mode 100644 (file)
index 0000000..d6b7ef3
--- /dev/null
+++ b/obj/nogui/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore