From dff4b3f598ed72e4a64ea61e6622b9bf1b60963f Mon Sep 17 00:00:00 2001
From: AnwariasEu <christian.steinhaus@rwth-aachen.de>
Date: Mon, 23 Mar 2015 00:13:44 +0100
Subject: [PATCH] Updated git branch, base-image in Make.conf.default

---
 config/Makefile.conf.defaults | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/Makefile.conf.defaults b/config/Makefile.conf.defaults
index 45924c8..6fdb847 100644
--- a/config/Makefile.conf.defaults
+++ b/config/Makefile.conf.defaults
@@ -23,13 +23,13 @@ SECONDARY_ARCH=i686
 ISO_BASE_URL=http://cdimage.ubuntu.com/kubuntu/releases
 ISO_RELEASE=trusty
 ISO_CHANNEL=release
-ISO_VERSION=14.04.1
+ISO_VERSION=14.04.2
 ISO_FLAVOR=kubuntu
 ISO_PATTERN_FLAGS=
 
 IMAGE_DIR=$(WORKSPACE)/image_files/
 IMAGE_GIT_URL=https://www.fsmpi.rwth-aachen.de/git/lipstick
-IMAGE_GIT_BRANCH=ws14
+IMAGE_GIT_BRANCH=ss15
 IMAGE_EXTRA_INFO=
 
 GPARTED_VERSION=0.21.0-1
-- 
GitLab