commit | bae95844d75b257c61cd0ef57b1d826bdca09032 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue May 13 21:58:48 2014 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Tue May 13 21:58:48 2014 +0100 |
tree | e2547df0ea03a6f686ac0cf7500bed3d00994ad2 | |
parent | ea5a223a2e8901fa9afa991d147751d8a6789443 [diff] | |
parent | b3e8d440ed0477e88232c3ba1779c67eafce3a48 [diff] |
Merge branch 'obsd-master' Conflicts: format.c window.c