From: Olivier Tétard <olivier.tetard@miskin.fr>
Date: Mon, 19 Dec 2011 13:08:27 +0000 (+0100)
Subject: Merge branch 'master' into amossys
X-Git-Url: http://olivier.miskin.fr/git/?a=commitdiff_plain;h=f21d63234aba00d887353bda4f3a370dc31aa1cb;hp=632160f874b337735b43f186f00e1a54b778ffcc;p=dotfiles2.git

Merge branch 'master' into amossys
---

diff --git a/gitconfig b/gitconfig
new file mode 100644
index 0000000..f4d2cfb
--- /dev/null
+++ b/gitconfig
@@ -0,0 +1,9 @@
+[giggle]
+	main-window-maximized = false
+	main-window-geometry = 1230x854+183+25
+	history-view-vpane-position = 539
+	file-view-vpane-position = 766
+	main-window-view = HistoryView
+[user]
+	name = Olivier Tétard
+	email = olivier.tetard@miskin.fr