From 6d59e9585db35d9a3c16f01b4180ea440e4b5a4a Mon Sep 17 00:00:00 2001
From: Frank Herchet <frank.fh.herchet@bmw.de>
Date: Tue, 14 Feb 2012 17:00:45 +0100
Subject: * merge of changes from Christian

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index b3857df..9e40053 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,6 @@ build/
 doc/
 packages/
 .*
+CHANGELOG
+includes/config.h
 
-- 
cgit v1.2.1