From: Anthony Liguori Date: Tue, 15 Jan 2013 22:53:10 +0000 (-0600) Subject: Merge remote-tracking branch 'stefanha/trivial-patches' into staging X-Git-Tag: v1.4.0-rc0~179 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58a864dec23f9052a5379a3ce81566e065c14afa;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'stefanha/trivial-patches' into staging * stefanha/trivial-patches: configure: try pkg-config for curses qom: Make object_resolve_path_component() path argument const Add libcacard/trace/generated-tracers.c to .gitignore Signed-off-by: Anthony Liguori --- 58a864dec23f9052a5379a3ce81566e065c14afa