diff options
| author | Luke Dashjr <[email protected]> | 2012-10-09 23:17:43 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-10-09 23:17:43 +0000 |
| commit | 4cf9b4c6fad8e2ead715c5fbbfb023e05826a94d (patch) | |
| tree | cf8d0b8d7abef0be531d4788b0653b1286136971 /src/test/data/script_valid.json | |
| parent | When datadir missing, show messagebox instead of printing error to stderr (diff) | |
| parent | Merge branch '0.4.x' into 0.5.x (diff) | |
| download | discoin-4cf9b4c6fad8e2ead715c5fbbfb023e05826a94d.tar.xz discoin-4cf9b4c6fad8e2ead715c5fbbfb023e05826a94d.zip | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/qt/transactiondesc.cpp
Diffstat (limited to 'src/test/data/script_valid.json')
0 files changed, 0 insertions, 0 deletions