Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver

author vlad <vlad@vlanout.(none)>

Wed, 18 Aug 2010 16:33:12 +0000 (19:33 +0300)

committer vlad <vlad@vlanout.(none)>

Wed, 18 Aug 2010 16:33:12 +0000 (19:33 +0300)
author vlad <vlad@vlanout.(none)>
Wed, 18 Aug 2010 16:33:12 +0000 (19:33 +0300)
committer vlad <vlad@vlanout.(none)>
Wed, 18 Aug 2010 16:33:12 +0000 (19:33 +0300)
diff --cc xscreensaver/config.guess

index 45bee13,951383e..951383e

mode 100755,100644..100755
--- 1/xscreensaver/config.guess
--- 2/xscreensaver/config.guess
+++ b/xscreensaver/config.guess
diff --cc xscreensaver/config.sub

index 87a1ee4,c060f44..c060f44

mode 100755,100644..100755
--- 1/xscreensaver/config.sub
--- 2/xscreensaver/config.sub
+++ b/xscreensaver/config.sub
author	vlad <vlad@vlanout.(none)>
	Wed, 18 Aug 2010 16:33:12 +0000 (19:33 +0300)
committer	vlad <vlad@vlanout.(none)>
	Wed, 18 Aug 2010 16:33:12 +0000 (19:33 +0300)
		1	2
xscreensaver/config.guess	patch \|	diff1 \|	diff2 \|	blob \| history
xscreensaver/config.sub	patch \|	diff1 \|	diff2 \|	blob \| history