From 8c8edf0f977c5a5fa5ca4dfb11e60d0735230624 Mon Sep 17 00:00:00 2001
From: Guillermo Bisheimer <gbisheimer@bys-control.com.ar>
Date: Sat, 17 May 2014 14:35:11 -0300
Subject: [PATCH 1/2] Add *:pyc compiled files to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 6913c156ab3..f9be5e7d852 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.pyc
 .*
 *.egg-info
 *.orig

From f1416728e7d8801ff88c6eeda923d42c0c336a64 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 19 May 2014 10:14:08 +0200
Subject: [PATCH 2/2] [FIX] port trunk bzrignore to gitignore

previous port only had the web client's rules
---
 .gitignore | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index f9be5e7d852..6148a29a95d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,28 @@
-*.pyc
-.*
-*.egg-info
-*.orig
-*.vim
-build
-_build
-/bin
-/dist
-/include
+# sphinx build directories
+_build/
 
-/share
-/man
-/lib
+# dotfiles
+.*
+# compiled python files
+*.py[co]
+# setup.py egg_info
+*.egg-info
+# emacs backup files
+*~
+# hg stuff
+*.orig
+status
+
+# generated for windows installer?
+install/win32/*.bat
+install/win32/meta.py
+
+# various virtualenv
+/bin/
+/build/
+/dist/
+/include/
+/lib/
+/man/
+/share/
+/src/