[xscreensaver/f18: 34/34] Merge remote-tracking branch 'origin/master' into f18

[Mamoru Tasaka]

commit 210eabd120637c0c841a2ba86f7e3d42cd6a2807
Merge: 1b558ae 10d4c86
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sun Dec 16 23:17:07 2012 +0900

    Merge remote-tracking branch 'origin/master' into f18

 xscreensaver-5.19-flurry-clangwarn.patch |   18 ++++++++++++++++++
 xscreensaver-5.19-lament-wireframe.patch |   16 ++++++++++++++++
 2 files changed, 34 insertions(+), 0 deletions(-)
---