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

Messages queue #295

Merged
merged 10 commits into from
May 6, 2016
Merged

Messages queue #295

merged 10 commits into from
May 6, 2016

Conversation

GrayHatter
Copy link
Member

This change is Reviewable

@GrayHatter
Copy link
Member Author

careful, this might resend every message every time you connect to a friend...

@GrayHatter GrayHatter mentioned this pull request Apr 25, 2016
@GrayHatter GrayHatter force-pushed the develop branch 2 times, most recently from 68351f3 to 82ed09b Compare April 28, 2016 06:42
Gregory Mullen (grayhatter) added 3 commits April 29, 2016 13:41
 Conflicts:
	src/main.c
    no real changes

	src/messages.c
    I think I got the updates to the structs corect

	src/messages.h
    had to reorg some of the structs

	src/tox.c

	src/tox_callbacks.h
    made some edits here, nothing too concerning, mostly debugs
@GrayHatter GrayHatter merged commit f918932 into develop May 6, 2016
@GrayHatter GrayHatter deleted the messages-queue branch November 18, 2016 23:59
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