![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Max Kellermann <max@duempel.org> | |
| Thu, 3 Nov 2011 16:42:07 +0000 (17:42 +0100) | ||
| committer | Max Kellermann <max@duempel.org> | |
| Thu, 3 Nov 2011 16:42:07 +0000 (17:42 +0100) | ||
| commit | 3bd95ba62353144987b8008435045b07d2307dd1 | |
| tree | 20c9654595823a39edb11766254e71058ea47c2f | tree | snapshot |
| parent | 44cf194be4a3400900ef6eca7e31f673dd5cce0a | commit | diff |
| parent | d981957c212c8ea589aed11e0d410a00f6d309cc | commit | diff |
Merge remote branches 'avuton/master' and 'jn/dev'
| configure.ac | diff1 | | diff2 | | blob | history |
| src/main.c | diff1 | | diff2 | | blob | history |
| src/options.c | diff1 | | diff2 | | blob | history |
| src/screen.c | diff1 | | diff2 | | blob | history |