diff options
| author | Luke Dashjr <[email protected]> | 2012-11-17 09:06:06 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-11-17 09:06:06 +0000 |
| commit | cb44c07349175514c608a115ec3bf92c23296e19 (patch) | |
| tree | 58908bbe050353000cb2cfe1aafcf9064b8ba854 /src/script.cpp | |
| parent | Revert translation adjustments for NACK'd 0.7.2 changes. (diff) | |
| parent | Merge branch '0.6.0.x' into 0.6.x (diff) | |
| download | discoin-cb44c07349175514c608a115ec3bf92c23296e19.tar.xz discoin-cb44c07349175514c608a115ec3bf92c23296e19.zip | |
Merge branch '0.6.x' into 0.7.x
Conflicts:
src/main.cpp
Diffstat (limited to 'src/script.cpp')
0 files changed, 0 insertions, 0 deletions