From 987af95391b9f2c1ce3274c1de29d12cafec1aa9 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetron.com>
Date: Fri, 12 Apr 2013 15:27:18 +0200
Subject: [PATCH] Harmonize branches on basis of project external pull requests
 p4#: 21273

---
 CMakeLists.txt | 1 +
 debian/rules   | 0
 2 files changed, 1 insertion(+)
 mode change 100755 => 100644 debian/rules

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b082632ee5..d99ac20fb8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,7 @@ project (ResInsight)
 set (VIZ_MODULES_FOLDER_NAME VisualizationModules)
 
 
+
 # Setup the main platform defines
 #-----------------------------------------------------
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644