From: Peter Maydell Date: Thu, 12 Nov 2015 10:09:14 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-11-11' into staging X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~121^2~1^2~73 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c459343b8552e65398a05581f7ff31a068b5b551;p=sdk%2Femulator%2Fqemu.git Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-11-11' into staging error: More error_setg() usage # gpg: Signature made Wed 11 Nov 2015 17:57:15 GMT using RSA key ID EB918653 # gpg: Good signature from "Markus Armbruster " # gpg: aka "Markus Armbruster " * remotes/armbru/tags/pull-error-2015-11-11: error: More error_setg() usage Signed-off-by: Peter Maydell --- c459343b8552e65398a05581f7ff31a068b5b551