Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No more cheatcoins #3

Merged
merged 3 commits into from
Feb 20, 2018
Merged

Conversation

jonano614
Copy link
Contributor

All cheatcoins are replaced by xdag

@jonano614
Copy link
Contributor Author

jonano614 commented Feb 18, 2018

Diff for some file in GUI wallet was not shown because github detects them as binary files.
The reason is the files have UTF-16 encoding. If you open some of these file in github - you can see message
default
I converted encoding in these files to UTF-8, so no problems should be in further PRs. But now - no diff for these files.

# Conflicts:
#	client/address.c
#	client/block.c
#	client/block.h
#	client/crypt.c
#	client/crypt.h
#	client/hash.c
#	client/log.c
#	client/log.h
#	client/main.c
#	client/main.h
#	client/netdb.c
#	client/pool.c
#	client/pool.h
#	client/storage.c
#	client/storage.h
#	client/sync.c
#	client/system.h
#	client/transport.c
#	client/transport.h
#	client/wallet.c
@jonano614 jonano614 merged commit 65c2d9b into XDagger:develop Feb 20, 2018
@jonano614 jonano614 deleted the cheatcoin_to_xdag branch March 6, 2018 13:49
jonano614 pushed a commit that referenced this pull request Mar 20, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant