From: Nick Hodges <nickhodges@gmail.com>
Date: Wed, 27 Nov 2013 20:03:08 +0000 (-0500)
Subject: Merging upstream
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=412d6907bcfd95e5f12422f3cb1dbd628cc9f4a8;p=gitignore.git

Merging upstream
---

412d6907bcfd95e5f12422f3cb1dbd628cc9f4a8
diff --cc Delphi.gitignore
index 94a0bc45,7f331f15..02acd6a9
--- a/Delphi.gitignore
+++ b/Delphi.gitignore
@@@ -7,8 -7,4 +7,8 @@@ __histor
  *.map
  *.exe
  *.dll
 +*.bpl
 +*.dcp
 +*.so
 +*.apk
- bin/*
+ bin/*