[xscreensaver/f17: 3/3] Merge remote-tracking branch 'origin/master' into f17

[Mamoru Tasaka]

commit ca2e51497696cd761297f4731b0819c9549493ca
Merge: 6ab1a7b c1ba5b7
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Wed Oct 17 10:54:20 2012 +0900

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

 .gitignore                                      |    1 +
 sources                                         |    2 +-
 xscreensaver-5.19-check-largefile-support.patch |   10 +++++++
 xscreensaver-5.19-engine-clangwarn.patch        |   11 --------
 xscreensaver-5.19-flurry-clangwarn.patch        |   18 -------------
 xscreensaver-5.19-lament-wireframe.patch        |   16 -----------
 xscreensaver.spec                               |   32 +++++++++++++----------
 7 files changed, 30 insertions(+), 60 deletions(-)
---