Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary

author Sohyun Kim <anna1014.kim@samsung.com>

Fri, 12 Nov 2010 11:09:29 +0000 (20:09 +0900)

committer Sohyun Kim <anna1014.kim@samsung.com>

Fri, 12 Nov 2010 11:09:29 +0000 (20:09 +0900)
author Sohyun Kim <anna1014.kim@samsung.com>
Fri, 12 Nov 2010 11:09:29 +0000 (20:09 +0900)
committer Sohyun Kim <anna1014.kim@samsung.com>
Fri, 12 Nov 2010 11:09:29 +0000 (20:09 +0900)
diff --cc data/edje_externals/Makefile.am
Simple merge
diff --cc data/edje_externals/icons.edc
Simple merge
diff --cc src/edje_externals/Makefile.am
Simple merge
diff --cc src/edje_externals/modules.inc
Simple merge
diff --cc src/lib/Elementary.h.in

index 8058c72,80ab213..636ae1d

mode 100755,100644..100755
--- 1/src/lib/Elementary.h.in
--- 2/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
author	Sohyun Kim <anna1014.kim@samsung.com>
	Fri, 12 Nov 2010 11:09:29 +0000 (20:09 +0900)
committer	Sohyun Kim <anna1014.kim@samsung.com>
	Fri, 12 Nov 2010 11:09:29 +0000 (20:09 +0900)
		1	2
data/edje_externals/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
data/edje_externals/icons.edc	patch \|	diff1 \|	diff2 \|	blob \| history
src/edje_externals/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/edje_externals/modules.inc	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/Elementary.h.in	patch \|	diff1 \|	diff2 \|	blob \| history