# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1281948837 -10800
# Node ID f0b00f465b83b0db4792bd3fa33b6576fa8d72b3
# Parent  d44496eade41783e407fd8f3d8eb988751ef6d29# Parent  6f08e70c510034f53b96dff66458abe9fe5a65f1
Automated merge with file:///cygdrive/d/srv/hg-home/skel

diff -r 6f08e70c5100 -r f0b00f465b83 .bazaar/bazaar.conf
diff -r 6f08e70c5100 -r f0b00f465b83 .bazaar/ignore
diff -r 6f08e70c5100 -r f0b00f465b83 .mc/bindings.cygwin
diff -r 6f08e70c5100 -r f0b00f465b83 .xserverrc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.xserverrc	Mon Aug 16 11:53:57 2010 +0300
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ -z "$COMPSPEC" ]; then
+  XWin -multiwindow -clipboard -silent-dup-error -xkblayout "us,ru" -xkboptions "grp:caps_toggle"
+else
+  X
+fi
diff -r 6f08e70c5100 -r f0b00f465b83 Makefile
--- a/Makefile	Mon Aug 16 11:50:44 2010 +0300
+++ b/Makefile	Mon Aug 16 11:53:57 2010 +0300
@@ -12,7 +12,10 @@
   host_os = windows
 endif
 
-OVERRIDDEN_ITEMS = .Xdefaults .bashrc .mailsign .xinitrc .vimrc .inputrc .ssh .hgrc .hgignore .bazaar .minttyrc
+OVERRIDDEN_ITEMS = \
+    .inputrc .minttyrc .Xdefaults .xinitrc .xserverrc \
+    .bashrc .mailsign .vimrc .ssh \
+    .hgrc .hgignore .bazaar
 MANUALINSTALL_ITEMS = .mc
 IFNONEXIST_ITEMS = .wgetrc