Merge branch 'master' of slp-scm.sec.samsung.net:slp/pkgs/n/nbeat-theme

author Jaehwan Kim <jae.hwan.kim@samsung.com>

Fri, 12 Aug 2011 10:47:21 +0000 (19:47 +0900)

committer Jaehwan Kim <jae.hwan.kim@samsung.com>

Fri, 12 Aug 2011 10:47:21 +0000 (19:47 +0900)
author Jaehwan Kim <jae.hwan.kim@samsung.com>
Fri, 12 Aug 2011 10:47:21 +0000 (19:47 +0900)
committer Jaehwan Kim <jae.hwan.kim@samsung.com>
Fri, 12 Aug 2011 10:47:21 +0000 (19:47 +0900)
diff --cc themes/inc/nbeat-black-inc.edc

index 7b06254,7c360bf..9a796b4

mode 100755,100644..100644
--- 1/themes/inc/nbeat-black-inc.edc
--- 2/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
diff --cc themes/inc/nbeat-hd-inc.edc

index 659e2b8,64ff399..5dab287

mode 100755,100644..100644
--- 1/themes/inc/nbeat-hd-inc.edc
--- 2/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
diff --cc themes/inc/nbeat-inc.edc

index 4e1a520,5e0f32d..794a22e

mode 100755,100644..100644
--- 1/themes/inc/nbeat-inc.edc
--- 2/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
author	Jaehwan Kim <jae.hwan.kim@samsung.com>
	Fri, 12 Aug 2011 10:47:21 +0000 (19:47 +0900)
committer	Jaehwan Kim <jae.hwan.kim@samsung.com>
	Fri, 12 Aug 2011 10:47:21 +0000 (19:47 +0900)
		1	2
themes/inc/nbeat-black-inc.edc	patch \|	diff1 \|	diff2 \|	blob \| history
themes/inc/nbeat-hd-inc.edc	patch \|	diff1 \|	diff2 \|	blob \| history
themes/inc/nbeat-inc.edc	patch \|	diff1 \|	diff2 \|	blob \| history