summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbnewbold <bnewbold@robocracy.org>2014-12-27 00:08:20 +0100
committerbnewbold <bnewbold@robocracy.org>2014-12-27 00:08:20 +0100
commit73882dec1eafe773753694117f0413c74bf9fda3 (patch)
treeacf871662142bfb5ab1c6d03e2d4a309c164cd8e
parente17fbefc6ff99b76d980658576d9c3543c8e9cdf (diff)
parenta9fc115ff097e9b1a433705ed76b0d3cc88cebde (diff)
downloadopenwrt-repro-73882dec1eafe773753694117f0413c74bf9fda3.tar.gz
openwrt-repro-73882dec1eafe773753694117f0413c74bf9fda3.zip
Merge remote-tracking branch 'origin/master'
Conflicts: .gitconfig
-rw-r--r--.xscreensaver4
1 files changed, 2 insertions, 2 deletions
diff --git a/.xscreensaver b/.xscreensaver
index 11dc49e..d24da77 100644
--- a/.xscreensaver
+++ b/.xscreensaver
@@ -1,5 +1,5 @@
# XScreenSaver Preferences File
-# Written by xscreensaver-demo 5.15 for bnewbold on Mon May 5 21:34:59 2014.
+# Written by xscreensaver-demo 5.15 for bnewbold on Sun May 18 21:25:26 2014.
# http://www.jwz.org/xscreensaver/
timeout: 0:10:00
@@ -47,7 +47,7 @@ programs: \
- maze -root \n\
- GL: superquadrics -root \n\
- attraction -root \n\
- blitspin -root \n\
+- blitspin -root \n\
- greynetic -root \n\
- helix -root \n\
- hopalong -root \n\