From: Jeahwan Kim <jae.hwan.kim@samsung.com>
Date: Fri, 29 Oct 2010 12:03:29 +0000 (+0900)
Subject: Merge branch 'master' of jae.hwan.kim@165.213.180.234:/git/slp/pkgs/elementary
X-Git-Tag: sbs-working-i386~99
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dd76a19c74e37dfdea9f8bcf57aa523d1705e68b;p=framework%2Fuifw%2Felementary.git

Merge branch 'master' of jae.hwan.kim@165.213.180.234:/git/slp/pkgs/elementary

Conflicts:
	TC/tet_scen_arm
---

dd76a19c74e37dfdea9f8bcf57aa523d1705e68b
diff --cc TC/tet_scen_arm
index 3cee8ea,966fbb9..8eea976
--- a/TC/tet_scen_arm
+++ b/TC/tet_scen_arm
@@@ -43,11 -43,7 +43,9 @@@ el
  	:include:/elm_ts/scrolled_entry/tslist
  	:include:/elm_ts/entry/tslist
  	:include:/elm_ts/dayselector/tslist
 +	:include:/elm_ts/tickernoti/tslist
- 
- jaehwan
- 	:include:/elm_ts/tickernoti/tslist
+ 	:include:/elm_ts/transit/tslist
 +
  #yhkim
  ch 
  	/telephony-framework/sim/unit/uts_tapi_verify_chv