popcornmix/omxplayer — pull request #177 by JontomXire (2014-03-30 10:26:42+00:00)
Title: Disable keyboard

When sorting out a merge conflict I accidentally pasted the clipboard and broke the file, so there are two commits in this pull request - the second undoes the accidental paste.