comparison TODO @ 79:01d939969b10

merge tn5250 branch into default
author Carl Byington <carl@five-ten-sg.com>
date Mon, 16 Jun 2014 08:24:00 -0700
parents 7ac846a07ed4
children 91a31873c42a
comparison
equal deleted inserted replaced
19:b3d0d806cbe2 79:01d939969b10
29 patch -p1 -l <patch.2014-04-19 >patch.log.2014-04-19 29 patch -p1 -l <patch.2014-04-19 >patch.log.2014-04-19
30 30
31 # reinstall all jsocks and ssh2 patches from vxconnectbot since the split 31 # reinstall all jsocks and ssh2 patches from vxconnectbot since the split
32 (cd ../vxconnectbot; git diff -w 598fb427f96712191cc264df14688d82db3dd664) | less 32 (cd ../vxconnectbot; git diff -w 598fb427f96712191cc264df14688d82db3dd664) | less
33 33
34 ==================================
35
36 merge tn5250j
37 svn checkout svn://svn.code.sf.net/p/tn5250j/code/branches/new-tabs-jse1.6 tn5250j
34 38
35 ================================== 39 ==================================
36 TODO: 40 TODO:
41
42 possible merge of irssi?
37 43
38 https://github.com/irssiconnectbot/irssiconnectbot 44 https://github.com/irssiconnectbot/irssiconnectbot
39 1.7.1-395 - a year ago 45 1.7.1-395 - a year ago
40 46
41 47
42 48
43 merge tn5250j
44 svn checkout svn://svn.code.sf.net/p/tn5250j/code/trunk tn5250j
45 after 5250 merge, go up to version 1.8.0-1
46 49