From: Sohyun Kim Date: Wed, 17 Nov 2010 08:38:21 +0000 (+0900) Subject: Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary X-Git-Tag: 1.0.0+svn.51480slp2+build63~14^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e7b11a5b55af65b3008481573889686eb35148b6;p=framework%2Fuifw%2Felementary.git Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary --- e7b11a5b55af65b3008481573889686eb35148b6 diff --cc src/lib/Elementary.h.in index 373ad76,be1f109..e50d45d mode 100644,100755..100644 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in