From 4493180230dd67e752e07d9d497e7c3a26dee1f7 Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Thu, 22 Jan 2015 10:47:28 +0100
Subject: tizen-distro: restore config templates and init scripts

This ensures that current main branch is exactly the same as rev_0.9
for these files. In particular the tizen-common-init-build-env and
tizen-ivi-init-build-env scripts were missing after re-creating
the merged repository.

Change-Id: Ic282071f09e35939d4d8a91f33a6f7e89187d947
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---
 .templateconf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.templateconf')

diff --git a/.templateconf b/.templateconf
index 0650a46625..0bf5ecf1e5 100644
--- a/.templateconf
+++ b/.templateconf
@@ -1,2 +1,2 @@
 # Template settings
-TEMPLATECONF=${TEMPLATECONF:-meta-yocto/conf}
+TEMPLATECONF=${TEMPLATECONF:-meta/conf}
-- 
cgit v1.2.3