| commit | f98d903b6d3bc87ecaa652596a306373597aeab6 | [log] [tgz] |
|---|---|---|
| author | Kristian Høgsberg <krh@bitplanet.net> | Fri Mar 02 08:14:40 2012 -0500 |
| committer | Kristian Høgsberg <krh@bitplanet.net> | Fri Mar 02 08:14:40 2012 -0500 |
| tree | 99ace232081812a57fbb9544dab9e16f1a0fdf0f | |
| parent | b9747d02c61adb28261c03ffdb584ce8fbed22b5 [diff] | |
| parent | 32bed57d5a27aee6ba6df1a5b101f5fbd1af44b6 [diff] |
Merge branch 'layers' I was integrating patches on the 'layers' branch and had a fixed version of the fullscreen patch there. My master branch had the fullscreen patch with the resize bug, and when I pushed I meant to push the layers branch to master. Conflicts: src/shell.c