diff options
| author | Peter Maydell | 2016-03-24 14:43:30 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-03-24 14:43:30 +0100 |
| commit | 4f57a35d81386df8840fd968251f44a95fc0f949 (patch) | |
| tree | b54632f5b6ff58e9752752ad4622c478387b7824 /net/filter-buffer.c | |
| parent | Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-20160323'... (diff) | |
| parent | ui/cocoa.m: switch to QKeyCode (diff) | |
| download | qemu-4f57a35d81386df8840fd968251f44a95fc0f949.tar.gz qemu-4f57a35d81386df8840fd968251f44a95fc0f949.tar.xz qemu-4f57a35d81386df8840fd968251f44a95fc0f949.zip | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-cocoa-20160323-1' into staging
cocoa queue:
* update cocoa UI front end to use QKeyCodes
* fix the help menu documentation links to actually work
(with both an installed and an uninstalled QEMU)
# gpg: Signature made Wed 23 Mar 2016 14:31:01 GMT using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg: aka "Peter Maydell <pmaydell@gmail.com>"
# gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
* remotes/pmaydell/tags/pull-cocoa-20160323-1:
ui/cocoa.m: switch to QKeyCode
qapi-schema.json: Add power and keypad equal keys
ui/cocoa.m: fix help menus
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net/filter-buffer.c')
0 files changed, 0 insertions, 0 deletions