projects / vuplus_xbmc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f1a67f2 fb70f24)
Merge branch 'jr-keyboard' of https://github.com/jhsrennie/xbmc into jhsrennie-simplifykb
authorJohn Rennie <john.rennie@ratsauce.co.uk>
Tue, 10 May 2011 16:44:02 +0000 (17:44 +0100)
committerJohn Rennie <john.rennie@ratsauce.co.uk>
Tue, 10 May 2011 16:44:02 +0000 (17:44 +0100)
Conflicts:
xbmc/input/KeyboardStat.cpp


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.