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

Merge hscroll change from @alescdb #147

Merged
merged 12 commits into from Aug 24, 2015
Merged

Conversation

kruton
Copy link
Member

@kruton kruton commented Aug 24, 2015

Multiple conflicts in the XML files caused this to be kind of hairy.

kruton added a commit that referenced this pull request Aug 24, 2015
@kruton kruton merged commit 84ac082 into connectbot:master Aug 24, 2015
@kruton kruton deleted the merge-hscroll branch August 24, 2015 05:48
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.

None yet

2 participants