Merge branch 'bip16_0.4.x' into 0.4.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Wed, 21 Mar 2012 17:30:56 +0000 (13:30 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Wed, 21 Mar 2012 17:30:56 +0000 (13:30 -0400)
commitcdc6b8d6a6ee4f0bfa721561c340cf8f6b81bc6a
tree9599899491f5f6e7d06a85931a5dd85231d25605
parent0e6c6e3fd1ab971c652e48fa04bac097e44e76fe
parent2f2ac3fece6c7f576c5957f05f342f2830301b54
Merge branch 'bip16_0.4.x' into 0.4.x
src/main.cpp
src/main.h