# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1272135113 -10800
# Node ID 505fcddef5c343ec856aa4cb6209bef5b54462be
# Parent  78d46cc0da4112d23bf1212ca3bb5c4b2a5a55cd# Parent  0980cc675a28da83936c81c82abaa2b4b3c8c832
Automated merge with file:///cygdrive/d/srv/hg/skel

diff -r 78d46cc0da41 -r 505fcddef5c3 .hgignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Sat Apr 24 21:51:53 2010 +0300
@@ -0,0 +1,10 @@
+syntax: glob
+*.o
+*.obj
+*.exe
+*.lib
+*.a
+*.so
+*.elc
+*.pyc
+*~
diff -r 78d46cc0da41 -r 505fcddef5c3 .hgrc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgrc	Sat Apr 24 21:51:53 2010 +0300
@@ -0,0 +1,11 @@
+[ui]
+username = Oleksandr Gavenko <gavenkoa@gmail.com>
+internal:merge =
+
+[defaults]
+log = -v
+incoming = -v
+outgoing = -v
+
+[extensions]
+hgext.fetch =
diff -r 78d46cc0da41 -r 505fcddef5c3 Makefile
--- a/Makefile	Tue Apr 20 12:10:22 2010 +0300
+++ b/Makefile	Sat Apr 24 21:51:53 2010 +0300
@@ -12,7 +12,7 @@
   host_os = windows
 endif
 
-ITEMS = .Xdefaults .bashrc .mailsign .xinitrc .mc .vimrc .inputrc .ssh
+ITEMS = .Xdefaults .bashrc .mailsign .xinitrc .mc .vimrc .inputrc .ssh .hgrc .hgignore
 
 .PHONY: install
 install: