From 636d3fa2f1329d0ed54a4a261cdab617723672b1 Mon Sep 17 00:00:00 2001
From: hannes <hannes@fedoraproject.org>
Date: Nov 21 2012 20:24:06 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/gretl


Conflicts:
	.gitignore
	gretl.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index 990cf3d..e422663 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,8 @@
 /gretl-1.9.7.tar.bz2
 /gretl-1.9.8.tar.bz2
 /gretl-1.9.9.tar.bz2
+<<<<<<< HEAD
 /gretl-1.9.11.tar.bz2
+=======
+/gretl-1.9.10.tar.bz2
+>>>>>>> 490b60340bc143d128156b0dcb4fc6fbd174ecad