# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1388169560 -7200
# Node ID cab9b4873f01b0ba748d3f58696d08a3d7a270f9
# Parent  486f006987f3459e9eee006f109e2910a7ec9b69# Parent  ee46e88fe0014304fab1468d5f2fa11de9e028ce
merged

diff -r ee46e88fe001 -r cab9b4873f01 .bashrc
--- a/.bashrc	Fri Dec 27 16:10:23 2013 +0200
+++ b/.bashrc	Fri Dec 27 20:39:20 2013 +0200
@@ -112,9 +112,8 @@
 alias ls='ls --color=auto'
 alias minicom='minicom -c on'
 
-# Show 3 months. Weeks start on Monday.
-alias cal='cal -3'
-alias ncal='ncal -3 -M'
+# Weeks start on Monday.
+alias ncal='ncal -M'
 
 # alias diff='LC_ALL=C TZ=GMT0 diff -Naur' #normalise diffs for distribution
 # alias sudo='sudo env PATH=$PATH' #work around sudo built --with-secure-path (ubuntu)
diff -r ee46e88fe001 -r cab9b4873f01 .fvwm/xdg2fvwm.py
--- a/.fvwm/xdg2fvwm.py	Fri Dec 27 16:10:23 2013 +0200
+++ b/.fvwm/xdg2fvwm.py	Fri Dec 27 20:39:20 2013 +0200
@@ -39,6 +39,8 @@
             else:
                 if icon.rfind('/') == -1 and icon.rfind('.') == -1:
                     icon = icon + ".xpm"
+                if icon.endswith('.svg'):
+                    icon = icon + ":32x32"
                 print u'AddToMenu "%s" "%s%%%s%%" Exec exec %s' % (name, desktop.getName(), icon, cmd)
         else:
             pass