From: Josh Triplett <josh@freedesktop.org>
Date: Fri, 28 Apr 2006 23:33:20 +0000 (-0700)
Subject: Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb
X-Git-Tag: 0.1^0
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?p=free-sw%2Fxcb%2Fdemo;a=commitdiff_plain;h=b168a8df6c8462ab3c2ff2949eae95e2dc266d77;hp=a285ac2f570e52793efe0a2d7ef76e32fdb28fb5

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb
---

diff --git a/README b/README
index 6967b1c..fc7b78f 100644
--- a/README
+++ b/README
@@ -13,5 +13,6 @@ neko/.......: XCB port of xneko.
 
 In tests/ :
 
+flames......: example of XCBImage use
 julia.......: example of XCBImage use, with a colormap.
-lissajoux...: simple example of XCBImage use.
+lissajoux...: simple example of XCBImage and shared memory use.