diff options
author | marha <marha@users.sourceforge.net> | 2015-05-26 19:43:34 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2015-05-26 19:43:34 +0200 |
commit | 912e881bec8b16f2331225960645c3bdf5a8ba2d (patch) | |
tree | 92afd568d4b3eaab1faf26d8d95d8c6df0173079 /libxcb/man | |
parent | 2e00f3764228cfc91180bbe9375a8d85e0e65a5b (diff) | |
parent | 843964ee791452b197e41dacb0146f5b456ffaa5 (diff) | |
download | vcxsrv-912e881bec8b16f2331225960645c3bdf5a8ba2d.tar.gz vcxsrv-912e881bec8b16f2331225960645c3bdf5a8ba2d.tar.bz2 vcxsrv-912e881bec8b16f2331225960645c3bdf5a8ba2d.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi_priv.h
mesalib/src/mesa/drivers/dri/swrast/swrast.c
xorg-server/dix/dispatch.c
xorg-server/os/utils.c
xorg-server/record/record.c
Diffstat (limited to 'libxcb/man')
-rw-r--r-- | libxcb/man/xcb-requests.man | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libxcb/man/xcb-requests.man b/libxcb/man/xcb-requests.man index 8d4a1dc5f..6b11883e6 100644 --- a/libxcb/man/xcb-requests.man +++ b/libxcb/man/xcb-requests.man @@ -36,7 +36,7 @@ void my_example(xcb_connection *conn) { cookie = xcb_intern_atom(conn, 0, strlen("_NET_WM_NAME"), "_NET_WM_NAME"); /* ... do other work here if possible ... */ if ((reply = xcb_intern_atom_reply(conn, cookie, NULL))) { - printf("The _NET_WM_NAME atom has ID %u\n", reply->atom); + printf("The _NET_WM_NAME atom has ID %u\\n", reply->atom); } free(reply); } @@ -118,7 +118,7 @@ void my_example(xcb_connection *conn, xcb_window_t window) { cookie = xcb_intern_atom(c, 0, strlen("_NET_WM_NAME"), "_NET_WM_NAME"); /* ... do other work here if possible ... */ if ((reply = xcb_intern_atom_reply(c, cookie, &error))) { - printf("The _NET_WM_NAME atom has ID %u\n", reply->atom); + printf("The _NET_WM_NAME atom has ID %u\\n", reply->atom); free(reply); } else { fprintf(stderr, "X11 Error %d\\n", error->error_code); @@ -138,7 +138,7 @@ void my_example(xcb_connection *conn, xcb_window_t window) { "_NET_WM_NAME"); /* ... do other work here if possible ... */ if ((reply = xcb_intern_atom_reply(c, cookie, NULL))) { - printf("The _NET_WM_NAME atom has ID %u\n", reply->atom); + printf("The _NET_WM_NAME atom has ID %u\\n", reply->atom); free(reply); } |