]> rtime.felk.cvut.cz Git - canping.git/commit
Merge my local version with 'master' of git://ortcan.git.sourceforge.net/gitroot...
authorMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 9 Nov 2010 11:59:41 +0000 (12:59 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 9 Nov 2010 12:00:03 +0000 (13:00 +0100)
commit472c30c0ba17095562f9d4b493e78c6a76350659
treec8cb5f59d452406a13d632fe4fdd7fc54bc6d36c
parent9c02efb698d2072ac7de98f5f606b44280c40518
parentb3cbed50cd413f51e628e6edde67eb369021bbae
Merge my local version with 'master' of git://ortcan.git.sourceforge.net/gitroot/ortcan/canping