From 602201a6fdd4b52a61f0b2a7ab25202c6cc1abb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Wed, 15 May 2013 16:41:27 -0300
Subject: Add CHANGELOG and fold in changes files

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

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 5eacabb9..01ab9bc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ pkg/osx/build
 MANIFEST
 _trial_temp*
 config/*
+CHANGELOG~
-- 
cgit v1.2.3