From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 18 Feb 2011 23:44:16 +0000 (-0800)
Subject: Merge branch 'trivial-fixes' of https://github.com/agimenez/bti into agimenez-trivial... 
X-Git-Url: https://git.toastfreeware.priv.at/gregoa/bti.git/commitdiff_plain/d77d22da5257c11cc06df0291ec2d2996bb8603b?hp=e14fa66ad8e52500503395e75fd07d07ce2a3ddd

Merge branch 'trivial-fixes' of https://github.com/agimenez/bti into agimenez-trivial-fixes

Conflicts:
	bti.c
---

diff --git a/.gitignore b/.gitignore
index 780cf47..6b1050f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@ stamp-h1
 depcomp
 INSTALL
 check-news.in
+tags
+TAGS