Xlinkkai protocol #13

Merged
merged 5 commits into from Nov 7, 2012

Projects

None yet

2 participants

@netonjm
Contributor
netonjm commented Nov 5, 2012

Pull request

netonjm added some commits Oct 10, 2012
@netonjm netonjm First Release
Added XLinkKai Protocol
a49307a
@netonjm netonjm - Deleted Android project (Created on new branch)
- Fixes PM
- Fixes Linkkai Protocol
0844028
@netonjm netonjm DELETED FILES 1be987b
@netonjm netonjm RELEASE PREVIEW HUB + TRANSLATOR
- More changes on code
- Added translator integration on Chat
- Added translation configuration in Settings tab
1c7fa3c
@netonjm netonjm Namespace changes and little additions 5deb486
@seuffert
Owner
seuffert commented Nov 7, 2012

i am going to merge it, but there are some small issues we might need to discuss and maybe change before we release another version.

@seuffert seuffert merged commit b6cd28d into seuffert:master Nov 7, 2012
@netonjm
Contributor
netonjm commented Nov 8, 2012

No problem Oli. You know where I am. ;-)

@seuffert seuffert added a commit that referenced this pull request May 20, 2013
@seuffert Revert "Merge pull request #13 from magurin/xlinkkai_protocol"
This reverts commit b6cd28d, reversing
changes made to 748d7a4.

Conflicts:
	SharpPcap/docs/Api/SharpPcap.xml
d2a315f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment