From 1f50389370d9666538fea2a1d3a2e2af638cc71f Mon Sep 17 00:00:00 2001
From: Petri Lehtinen <petri@digip.org>
Date: Tue, 22 May 2012 20:48:16 +0300
Subject: [PATCH] #14472: Update .gitignore

Patch by Matej Cepl.
---
 .gitignore | 19 +++++++++++++++++++
 Misc/ACKS  |  1 +
 Misc/NEWS  |  2 ++
 3 files changed, 22 insertions(+)

diff --git a/.gitignore b/.gitignore
index 7dfc5ad3a4f..c1a8055e6dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,13 +5,17 @@
 *.pyd
 *.pyo
 *.rej
+*.swp
 *~
+.gdb_history
 Doc/build/
 Doc/tools/docutils/
+Doc/tools/jinja/
 Doc/tools/jinja2/
 Doc/tools/pygments/
 Doc/tools/sphinx/
 Lib/lib2to3/*.pickle
+Lib/plat-mac/errors.rsrc.df.rsrc
 Makefile
 Makefile.pre
 Misc/python.pc
@@ -30,20 +34,35 @@ PCbuild/*.ncb
 PCbuild/*.o
 PCbuild/*.pdb
 PCbuild/Win32-temp-*
+PCbuild/amd64/
+.purify
 Parser/pgen
 Parser/pgen.stamp
 __pycache__
 autom4te.cache
 build/
+buildno
+config.cache
+config.log
+config.status
+config.status.lineno
+core
+db_home
 config.log
 config.status
 libpython*.a
 libpython*.so*
+platform
 pybuilddir.txt
 pyconfig.h
 python
+python.exe
 python-gdb.py
+python.exe-gdb.py
+reflog.txt
+.svn/
 tags
+TAGS
 .coverage
 coverage/
 htmlcov/
diff --git a/Misc/ACKS b/Misc/ACKS
index bea7eba0c54..a9280885c3e 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -150,6 +150,7 @@ Lorenzo M. Catucci
 Donn Cave
 Charles Cazabon
 Per Cederqvist
+Matej Cepl
 Octavian Cerna
 Pascal Chambon
 John Chandler
diff --git a/Misc/NEWS b/Misc/NEWS
index ec5cd9878e4..d435b198c2c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -257,6 +257,8 @@ Tests
 Build
 -----
 
+- Issue #14472: Update .gitignore. Patch by Matej Cepl.
+
 - The Windows build now uses OpenSSL 1.0.0j and bzip2 1.0.6.
 
 - Issue #14557: Fix extensions build on HP-UX. Patch by Adi Roiban.