Merge pull request #63 from vikramrajkumar/btsx

Merge upstream
bitshares · Sep 21, 2014 · 3355af4 · 3355af4
2 parents b513517 + 8b2b2a6
commit 3355af4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/libraries/fc b/libraries/fc
diff --git a/programs/qt_wallet b/programs/qt_wallet
diff --git a/programs/web_wallet b/programs/web_wallet