Merge branch 'master' of /home/aflit001

7527d41e · sauloal · 91e437fb · 1907cbbe · 7527d41e · 7527d41e
Commit 7527d41e authored Nov 12, 2012 by sauloal
--- a/aflit001/.vnc/assembly:8.pid
+++ b/aflit001/.vnc/assembly:8.pid
-15732
+35293
--- a/aflit001/bin/vncStart
+++ b/aflit001/bin/vncStart
@@ -5,10 +5,10 @@ DEPTH=16
 #DEPTH=24
 #DEPTH=32
 #GEOMETRY=1360x768
-GEOMETRY=1440x900
+#GEOMETRY=1440x900
 #GEOMETRY=1024x768
 #GEOMETRY=1280x1024
-#GEOMETRY=1680x1050
+GEOMETRY=1680x1050
 #GEOMETRY=1710x1080
 PORT=8