diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-11-21 13:22:18 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-11-21 13:22:18 +0000 |
| commit | a00c1173385741007f71ce505d092f4cc174f449 (patch) | |
| tree | d57daeed231b0c39f116512d90a3b36179e20859 /net/slirp.c | |
| parent | 9c7074da5ec64e1fd61df881ab291f75541ff2b0 (diff) | |
| parent | b310a2a6095ec927a42cc1aba520a316be0faf51 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20141121-1' into staging
gtk: two bugfixes for 2.2.
# gpg: Signature made Fri 21 Nov 2014 07:38:45 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-gtk-20141121-1:
gtk: Don't crash if -nodefaults
gtk: fix possible memory leak about local_err
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net/slirp.c')
0 files changed, 0 insertions, 0 deletions