From e333d6f32370090d24d0090cd62f1959ec8a8fd6 Mon Sep 17 00:00:00 2001
From: mutantturkey <crazycal00@gmail.com>
Date: Thu, 17 Jun 2010 14:03:46 -0400
Subject: Merge remote branch 'vicfryzel/master'

Conflicts:
	mt.c
---
 config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config.mk')

diff --git a/config.mk b/config.mk
index 629b51d..f05715c 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # mocicon version:
-VERSION = 0.1.4
+VERSION = 0.1.4
 
 # Customize below to fit your system
 
-- 
cgit v1.2.3