![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <ff@octo.it> | |
| Thu, 25 Sep 2014 00:10:54 +0000 (17:10 -0700) | ||
| committer | Florian Forster <ff@octo.it> | |
| Thu, 25 Sep 2014 00:10:54 +0000 (17:10 -0700) | ||
| commit | 8557f59b71eb64324dcbb0e470bad9ca5958b2f0 | |
| tree | 4ace31eaec5e8ce25ee3e07ec657c56669b05ab4 | tree | snapshot |
| parent | 4710e5477bfa3902b5f5600475ea21c44fabf446 | commit | diff |
| parent | 441f2f6f137275321d6bb3d8bfb35f414c580ab6 | commit | diff |
Merge branch 'bp/exit'
Conflicts:
src/mans/oping.pod
src/oping.c
Conflicts:
src/mans/oping.pod
src/oping.c
| src/mans/oping.pod | diff1 | | diff2 | | blob | history |
| src/oping.c | diff1 | | diff2 | | blob | history |