Merge pull request #704 from pfmooney/7cf594a95f2fac1c11aab0395a96225cbab14216
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 25 Aug 2012 16:40:05 +0000 (09:40 -0700)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 25 Aug 2012 16:40:05 +0000 (09:40 -0700)
Fix for issue 540: ctrl-enter toggles fullscreen

1  2 
client/X11/xf_event.c
client/X11/xf_keyboard.c

Simple merge
Simple merge