view TODO @ 449:1c9d043c2c03

fix lint error
author Carl Byington <>
date Thu, 17 Mar 2016 13:49:04 -0700
parents 8fa8e73e2f5c
children 0f53523562bb
line wrap: on
line source


This project started with the base version of vxconnectbot:
    git clone vxconnectbot
    commit 5f70cc011cd131acb5cd29783fa6744059841aee
    Merge: 429b47c 53e8530
    Author: Martin Matuška <>
    Date:   Wed Oct 30 00:21:40 2013 -0700

Changes from connectbot were merged:
    git clone connectbot
    commit d64786d9197090c74072b648e487e3d34817bb57
    Author: Torne Wuff <>
    Date:   Sun Mar 2 20:25:25 2014 +0000q

Connectbot and VXConnectbot split at 598fb427f96712191cc264df14688d82db3dd664

# take jsocks and ssh2 from current connectbot
rm -rf src/net/sourceforge/jsocks
rm -rf src/com/trilead/ssh2
cp -a ../connectbot/src/net/sourceforge/jsocks src/net/sourceforge
cp -a ../connectbot/src/com/trilead/ssh2       src/com/trilead

# take all the connectbot patches since the split, except jsocks and ssh2
(cd ../connectbot; git diff -w 598fb427f96712191cc264df14688d82db3dd664) | \
sed -e 's;/org/connectbot/;/com/five_ten_sg/connectbot/;g' >patch.2014-04-19
emacs patch.2014-04-19
# remove all patches for trilead and jsocks
patch -p1 -l  <patch.2014-04-19 >patch.log.2014-04-19

# reinstalled all jsocks and ssh2 patches from vxconnectbot since the split
(cd ../vxconnectbot; git diff -w 598fb427f96712191cc264df14688d82db3dd664) | less


merged tn5250j
svn checkout svn:// tn5250j


updated com.trilead.ssh2 to ganymed
svn checkout ganymed-ssh-2-read-only
rev 161


merged tn5250j updates
svn checkout svn:// tn5250j


updated jsocks to 2011-03-19 version
updated jzlib to a21be20213d66eff15904d925e9b721956a01ef7

git clone jzlib
commit a21be20213d66eff15904d925e9b721956a01ef7
Merge: 9d0fcb9 3e3dae9
Author: Atsuhiko Yamanaka <>
Date:   Tue Nov 19 19:03:18 2013 -0800


git clone irssiconnectbot
commit 1e0f702be47ad27b85e67722f177e3c129e91196
Merge: d3553dd 6420dd5
Author: Iiro Uusitalo <>
Date:   Sun Jan 6 21:07:06 2013 -0800

Nothing critical there, so I will ignore that fork for now.


merge more tn5250j updates
svn checkout svn:// tn5250j-code


change all System.*.println -> android Log.d(TAG, "") calls

possible move to

possible merge changes from