merge master
commita7e2c92ddf6c27b2cfcc9782fd71f15d36162cce
authorjave <joakim@verona.se>
Sun, 4 Jan 2015 08:09:36 +0000 (4 09:09 +0100)
committerjave <joakim@verona.se>
Sun, 4 Jan 2015 08:09:36 +0000 (4 09:09 +0100)
tree7e092998b7e6956f311a169e0d87254ef87703e3
parentdb4613576d3115aa320f0293d081ce98baa06acd
parentfec9b792f543c35b1a635b3a3326d496e3ca9012
merge master
src/Makefile.in
src/xterm.c