minkyu kim [Tue, 2 Apr 2013 02:17:40 +0000 (11:17 +0900)]
Merge "modify to calculate longpress time" into tizen_2.1
Bang Keuck do [Tue, 2 Apr 2013 02:14:55 +0000 (11:14 +0900)]
Merge "Fixed TC fail regarding form." into tizen_2.1
minkyu kim [Tue, 2 Apr 2013 02:13:36 +0000 (11:13 +0900)]
modify to calculate longpress time
Change-Id: I18bcc855ea71015fdcf68849ce8a8103206a97ba
“Bumseung [Tue, 2 Apr 2013 01:42:46 +0000 (10:42 +0900)]
The systel color table is updated to Ver.
20130329.
Change-Id: I2a53a860191f38af2a0561392e41df2d99ff7cda
Signed-off-by: “Bumseung <bumseung.cho@samsung.com>
Keuckdo Bang [Tue, 2 Apr 2013 01:16:40 +0000 (10:16 +0900)]
Fixed TC fail regarding form.
Change-Id: Iee17f1994da754027de90d4f44e99c7f2e363c05
Sungyeon Woo [Tue, 2 Apr 2013 00:07:35 +0000 (09:07 +0900)]
modified return value GetTextExtentList
Change-Id: I202e3f03480f38e4410565a6af8e6cd000ee7715
Signed-off-by: Sungyeon Woo <s.woo@samsung.com>
Kang Hee Ju [Mon, 1 Apr 2013 13:39:57 +0000 (22:39 +0900)]
Merge "Fix GetControl() function exception error" into tizen_2.1
sr.shashank [Mon, 1 Apr 2013 13:19:36 +0000 (18:49 +0530)]
Fix for N_SE-31260.
Change-Id: I175db588c51b8b1759fe4477f59a0346ddc590ea
Signed-off-by: sr.shashank <sr.shashank@samsung.com>
jaewon7.cho [Mon, 1 Apr 2013 12:50:31 +0000 (21:50 +0900)]
Fix GetControl() function exception error
Change-Id: I15ffa312d8bcfd9e016ec0eaf40a799c0912dc34
Signed-off-by: jaewon7.cho <jaewon7.cho@samsung.com>
Sukwon Suh [Mon, 1 Apr 2013 12:23:04 +0000 (21:23 +0900)]
Merge "disable FBO and window surface for Frame" into tizen_2.1
Sukwon Suh [Mon, 1 Apr 2013 12:10:14 +0000 (21:10 +0900)]
disable FBO and window surface for Frame
Change-Id: Ieb587387855ee513ebf02fb8161fe5b806484e77
Signed-off-by: Sukwon Suh <sukwon.suh@samsung.com>
Syed Khaja Moinuddin [Mon, 1 Apr 2013 10:43:37 +0000 (19:43 +0900)]
Merge "Fixed UTs Crash in GroupedList & SlidableGroupedList. Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>" into tizen_2.1
kishorekumar Dachinamoorthy [Mon, 1 Apr 2013 10:22:32 +0000 (15:52 +0530)]
Fixing the JIRA issues N_SE-31006, N_SE-31007, TDIS_4970.
Change-Id: Ieb62eb6e13a362857a01b3d5cfebf98acd774a5c
Signed-off-by: kishorekumar Dachinamoorthy <kishore.d@samsung.com>
DongJinJeon [Mon, 1 Apr 2013 10:08:35 +0000 (19:08 +0900)]
popup clientarea margin roll back
Change-Id: I1b230439eab352daa41af4d5836cf3e62a12faba
Signed-off-by: DongJinJeon <dongjin2193.jeon@samsung.com>
Choongeun Hong [Mon, 1 Apr 2013 09:41:10 +0000 (18:41 +0900)]
Merge "Fixed button crash" into tizen_2.1
Choongeun Hong [Mon, 1 Apr 2013 08:44:10 +0000 (17:44 +0900)]
Fixed button crash
Change-Id: I51a77dbf2b682c116d253aa243e720ff2a77e5d9
Signed-off-by: Choongeun Hong <cheun.hong@samsung.com>
keonpyo.kong [Mon, 1 Apr 2013 09:33:29 +0000 (18:33 +0900)]
Merge "Chage get orientation status for popup" into tizen_2.1
Jinhwan Kim [Mon, 1 Apr 2013 08:58:05 +0000 (17:58 +0900)]
Merge "Fixed a defect. (N_SE-30713)" into tizen_2.1
wonyoung12.lee [Mon, 1 Apr 2013 08:57:13 +0000 (17:57 +0900)]
Merge "Modify for P1300328-1966, P130312-7850 and Change using Model API" into tizen_2.1
wonyoung12.lee [Mon, 1 Apr 2013 08:31:02 +0000 (17:31 +0900)]
Modify for P1300328-1966, P130312-7850 and Change using Model API
Change-Id: I9ade46ed4a7d5b8c028329c0ff3b8fbc4dcc6542
Signed-off-by: wonyoung12.lee <wonyoung12.lee@samsung.com>
Jinhwan Kim [Mon, 1 Apr 2013 08:05:45 +0000 (17:05 +0900)]
RefreshList optimization
Change-Id: I838ac866e81a9cbc0f19efa2e0765e36417ce5f3
Signed-off-by: Jinhwan Kim <jh-21.kim@samsung.com>
Kang Hee Ju [Mon, 1 Apr 2013 07:42:17 +0000 (16:42 +0900)]
Merge "Revert "Adjust the position of the partial Frame"" into tizen_2.1
Choi Munseok [Mon, 1 Apr 2013 07:35:08 +0000 (16:35 +0900)]
Revert "Adjust the position of the partial Frame"
This reverts commit
f74c2032de5c0603e9a1a912fa3eb0b322a261a0
Syed Khaja Moinuddin [Mon, 1 Apr 2013 07:15:00 +0000 (16:15 +0900)]
Fixed UTs Crash in GroupedList & SlidableGroupedList.
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Change-Id: Ib70f58c44cc23e91e2f0bf69f8e979c5ca74a08a
Sungyeon Woo [Mon, 1 Apr 2013 06:47:50 +0000 (15:47 +0900)]
Merge "remove unnecssary invalid check in _Font" into tizen_2.1
Sungyeon Woo [Mon, 1 Apr 2013 06:42:07 +0000 (15:42 +0900)]
remove unnecssary invalid check in _Font
Change-Id: I516f1268b9e708c4cbc260cbcb77ee500c335eef
Signed-off-by: Sungyeon Woo <s.woo@samsung.com>
Ki-Dong Hong [Mon, 1 Apr 2013 06:41:38 +0000 (15:41 +0900)]
Merge "[BackOut] Change I19204c45: [P130329-8999] Touch sound problem on messagebox is fixed" into tizen_2.1
Sungyeon Woo [Mon, 1 Apr 2013 06:16:12 +0000 (15:16 +0900)]
bidi cache
Change-Id: I9f96b35ebb33807ef575612e88280584797d61c2
Signed-off-by: Sungyeon Woo <s.woo@samsung.com>
keonpyo.kong [Mon, 1 Apr 2013 06:15:35 +0000 (15:15 +0900)]
Chage get orientation status for popup
Change-Id: I974f867dc39cc5b68f5db9f6494a6f1032d59809
Signed-off-by: keonpyo.kong <keonpyo.kong@samsung.com>
“Bumseung [Mon, 1 Apr 2013 06:12:09 +0000 (15:12 +0900)]
[BackOut] Change I19204c45: [P130329-8999] Touch sound problem on messagebox is fixed
Change-Id: Idaaa0c98aaf0721caecde813dbf07483490790d2
Signed-off-by: “Bumseung <bumseung.cho@samsung.com>
Jeahoon Kim [Mon, 1 Apr 2013 05:18:31 +0000 (14:18 +0900)]
Fixed a defect. (N_SE-30713)
Change-Id: I39d41ddcb8158dc33f63cb72773f1c9bcd515842
Signed-off-by: Jeahoon Kim <jeahoon.kim@samsung.com>
Ki-Dong Hong [Mon, 1 Apr 2013 04:20:56 +0000 (13:20 +0900)]
Merge "[P130329-8999] Touch sound problem on messagebox is fixed." into tizen_2.1
“Bumseung [Mon, 1 Apr 2013 04:20:04 +0000 (13:20 +0900)]
[P130329-8999] Touch sound problem on messagebox is fixed.
Change-Id: I19204c45103c2fa0a1c977793872628eb5e56c17
Signed-off-by: “Bumseung <bumseung.cho@samsung.com>
Ki-Dong Hong [Mon, 1 Apr 2013 04:19:07 +0000 (13:19 +0900)]
Merge "Change file name" into tizen_2.1
Syed Khaja Moinuddin [Mon, 1 Apr 2013 02:08:43 +0000 (11:08 +0900)]
Modified GetValue return value in CustomListItem.
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Change-Id: If8a351d027386d1c758d0fb4c57ff4be61419b9a
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Choi Munseok [Mon, 1 Apr 2013 02:17:32 +0000 (11:17 +0900)]
Adjust the position of the partial Frame
Change-Id: I72259d9f69c0dadf9d4f3f2c1dac6530b42e9e0c
Signed-off-by: Choi Munseok <ms47.choi@samsung.com>
Choongeun Hong [Mon, 1 Apr 2013 02:12:04 +0000 (11:12 +0900)]
Change file name
Change-Id: I6a6ae6142291c021d85481892aedc193d6bc6e9e
Signed-off-by: Choongeun Hong <cheun.hong@samsung.com>
Kang Hee Ju [Sun, 31 Mar 2013 10:47:13 +0000 (19:47 +0900)]
Merge "modify float position, modify propagatedEventListener" into tizen_2.1
minkyu kim [Sun, 31 Mar 2013 10:44:30 +0000 (19:44 +0900)]
modify float position, modify propagatedEventListener
Change-Id: I1cfee01419bbd4dbf7f6a2e098a60344cde9506e
keonpyo.kong [Sun, 31 Mar 2013 09:23:06 +0000 (18:23 +0900)]
In DetachingFromMainTree, Set __isCalledCallOnAttachedToMainTree to false
Change-Id: I9a49951a70aee5a8a8bcd65ef8e96b598528f296
Signed-off-by: keonpyo.kong <keonpyo.kong@samsung.com>
Choi Munseok [Sun, 31 Mar 2013 08:24:07 +0000 (17:24 +0900)]
Fix rotation
Change-Id: I33628165926893647833590586dd1b415f0063af
Signed-off-by: Choi Munseok <ms47.choi@samsung.com>
Choi Munseok [Sun, 31 Mar 2013 07:33:42 +0000 (16:33 +0900)]
Unset rotate_cb
Change-Id: I5bc4380af2bdb1fd3569140c96b2c9b40f058bfe
Signed-off-by: Choi Munseok <ms47.choi@samsung.com>
woo [Sun, 31 Mar 2013 07:04:49 +0000 (16:04 +0900)]
Merge "apply doxygen review" into tizen_2.1
MinSung Jin [Sun, 31 Mar 2013 06:16:38 +0000 (15:16 +0900)]
Modified Expand/Collapse Animation
Change-Id: Ib46feb24542af99590e60d6f71fbdaa0417df743
Signed-off-by: MinSung Jin <minsung.jin@samsung.com>
woo [Fri, 29 Mar 2013 07:16:02 +0000 (16:16 +0900)]
apply doxygen review
Change-Id: I16f2a59b51866a1bb0a1ac9d3cc53aa723d0cb7c
woo [Sun, 31 Mar 2013 02:58:08 +0000 (11:58 +0900)]
fix orientation
Change-Id: Id24ca619827e6ecc7d17599b7e00e7882df6331f
Signed-off-by: woo <s-w.woo@samsung.com>
“Bumseung [Sat, 30 Mar 2013 13:00:21 +0000 (22:00 +0900)]
[P130318-7356] Double tap sound bug is fixed.
Change-Id: Ia45839bb21c3db3be5c84d59972673002c3a1dfb
Signed-off-by: “Bumseung <bumseung.cho@samsung.com>
“Bumseung [Sat, 30 Mar 2013 12:26:55 +0000 (21:26 +0900)]
The system default theme is applied.
Change-Id: I57c3998094aff031cbbc95a0a9ceaa3ef84ccbff
Signed-off-by: “Bumseung <bumseung.cho@samsung.com>
“Bumseung [Sat, 30 Mar 2013 12:26:17 +0000 (21:26 +0900)]
[P130318-7356] Double tap sound bug is fixed.
Change-Id: Ie314801f2240969a87b968375a784e1c19a714a5
Signed-off-by: “Bumseung <bumseung.cho@samsung.com>
“Bumseung [Sat, 30 Mar 2013 09:23:07 +0000 (18:23 +0900)]
Merge "JIRA issue:Resource shape lookup bug is fixed." into tizen_2.1
“Bumseung [Sat, 30 Mar 2013 08:44:11 +0000 (17:44 +0900)]
JIRA issue:Resource shape lookup bug is fixed.
Change-Id: I8157160846cea93b6b887f63c09b5401a5706112
Signed-off-by: “Bumseung <bumseung.cho@samsung.com>
Sungyeon Woo [Sat, 30 Mar 2013 08:09:11 +0000 (17:09 +0900)]
remove unnecessary GetTextExtent code
Change-Id: Ibc0500f25f4061b2445cdec62f9cd49023a58b00
Signed-off-by: Sungyeon Woo <s.woo@samsung.com>
Sungyeon Woo [Sat, 30 Mar 2013 07:44:41 +0000 (16:44 +0900)]
modified FontImpl
Change-Id: I883b7017e3f3314bcc5d26fb439b1380c36c3c60
Signed-off-by: Sungyeon Woo <s.woo@samsung.com>
Youngki Ahn [Sat, 30 Mar 2013 07:29:18 +0000 (16:29 +0900)]
Merge "_Font::GetTextExtentList() API added" into tizen_2.1
jaewon7.cho [Sat, 30 Mar 2013 07:23:02 +0000 (16:23 +0900)]
Merge "Change ownership policy of SearchBar::SetContent() and SplitPanel::SetPane() function" into tizen_2.1
jaewon7.cho [Sat, 30 Mar 2013 07:10:21 +0000 (16:10 +0900)]
Change ownership policy of SearchBar::SetContent() and SplitPanel::SetPane() function
Change-Id: Ib180de6d4dfef52a2a87c0ffc48b9ebff838c00a
Signed-off-by: jaewon7.cho <jaewon7.cho@samsung.com>
Youngki Ahn [Sat, 30 Mar 2013 07:01:50 +0000 (16:01 +0900)]
_Font::GetTextExtentList() API added
Change-Id: I33968571f7e03f2ab3b8589d6a827125bf62bf84
Signed-off-by: Youngki Ahn <ykahn@samsung.com>
Sungyeon Woo [Sat, 30 Mar 2013 06:55:12 +0000 (15:55 +0900)]
applied bold style for bidi
Change-Id: I23ef0aa4eb4726a403a7696ca892d42e7491b528
Signed-off-by: Sungyeon Woo <s.woo@samsung.com>
Syed Khaja Moinuddin [Fri, 29 Mar 2013 12:58:17 +0000 (21:58 +0900)]
Applied new bitmaps in EditTime control
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Change-Id: I6957675183e2d1be9d170eea658cde9104abf769
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Syed Khaja Moinuddin [Fri, 29 Mar 2013 09:41:18 +0000 (18:41 +0900)]
Implemented changes to show Date / time format strings
in regional language.
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Change-Id: I6dcd64128fb2424ba3d6443c93c0760594297dd8
Daeyoung Ryu [Fri, 29 Mar 2013 12:10:30 +0000 (21:10 +0900)]
Merge "Context font size is fixed." into tizen_2.1
“Bumseung [Fri, 29 Mar 2013 12:10:06 +0000 (21:10 +0900)]
Context font size is fixed.
Change-Id: I880da6775558a112ac06ab82a21c1eabbe0baa6a
Signed-off-by: “Bumseung <bumseung.cho@samsung.com>
Syed Khaja Moinuddin [Fri, 29 Mar 2013 12:09:22 +0000 (21:09 +0900)]
Merge "updating winset3.1 resources for slider, progress controls for HD." into tizen_2.1
minkyu kim [Fri, 29 Mar 2013 12:08:16 +0000 (21:08 +0900)]
Merge "touch lockup issue in navigation app" into tizen_2.1
minkyu kim [Fri, 29 Mar 2013 11:59:13 +0000 (20:59 +0900)]
touch lockup issue in navigation app
Change-Id: I06db2c9fa13c1559cc93dca7208c041f07fd1184
Kang Hee Ju [Fri, 29 Mar 2013 11:24:55 +0000 (20:24 +0900)]
Merge "add clipboard key codes" into tizen_2.1
Choi Munseok [Fri, 29 Mar 2013 11:11:52 +0000 (20:11 +0900)]
Add logs
Change-Id: I3710d36c380f18fe01618b78028241b48aa908ab
Signed-off-by: Choi Munseok <ms47.choi@samsung.com>
minkyu kim [Fri, 29 Mar 2013 11:05:29 +0000 (20:05 +0900)]
add clipboard key codes
Change-Id: I1be89c96cf2f48c04cab2211747f849c3a2490b4
Ki-Dong Hong [Fri, 29 Mar 2013 10:24:17 +0000 (19:24 +0900)]
Merge "fix label setfont" into tizen_2.1
Myung Jin Kim [Fri, 29 Mar 2013 10:23:38 +0000 (19:23 +0900)]
fix label setfont
Change-Id: I6264ad014718bc59e0b48d9ac1d0fc7a705862b3
Sukwon Suh [Fri, 29 Mar 2013 10:23:07 +0000 (19:23 +0900)]
Merge "add GLchar in opengl header" into tizen_2.1
MyungJinKim [Fri, 29 Mar 2013 10:21:56 +0000 (19:21 +0900)]
Merge "fix setfont logic" into tizen_2.1
Sukwon Suh [Fri, 29 Mar 2013 10:00:42 +0000 (19:00 +0900)]
add GLchar in opengl header
Change-Id: I0f404751ee3f7243d156a5a2d66bbc5f09144dc7
Signed-off-by: Sukwon Suh <sukwon.suh@samsung.com>
Ki-Dong Hong [Fri, 29 Mar 2013 09:40:49 +0000 (18:40 +0900)]
Merge "A crash issue is fixed." into tizen_2.1
“Bumseung [Fri, 29 Mar 2013 09:36:26 +0000 (18:36 +0900)]
A crash issue is fixed.
Change-Id: Idd1a9a71c0c8613ea491c5ff84a7226d0d033e5b
Signed-off-by: “Bumseung <bumseung.cho@samsung.com>
DongJinJeon [Fri, 29 Mar 2013 09:17:49 +0000 (18:17 +0900)]
Merge "Fixed N_SE-30446" into tizen_2.1
Sungyeon Woo [Fri, 29 Mar 2013 08:37:22 +0000 (17:37 +0900)]
Merge "bug fix collation language" into tizen_2.1
Sungyeon Woo [Fri, 29 Mar 2013 07:35:10 +0000 (16:35 +0900)]
bug fix collation language
Change-Id: Ie02d3b1bf96a4859296fd8fc0a80a149e1744b49
Signed-off-by: Sungyeon Woo <s.woo@samsung.com>
Kang Hee Ju [Fri, 29 Mar 2013 08:27:45 +0000 (17:27 +0900)]
Merge "Modified initialization of TableViewItem height list when calling UpdateTableView" into tizen_2.1
Ki-Dong Hong [Fri, 29 Mar 2013 08:23:59 +0000 (17:23 +0900)]
Merge "Resource manager refactoring" into tizen_2.1
jaewon7.cho [Fri, 29 Mar 2013 07:54:08 +0000 (16:54 +0900)]
Update _Control/_ControlImpl::OnCanvasRequestedFN() function
Change-Id: I4f0517ca092ad3145443e322b40dd1fa9de5d721
Signed-off-by: jaewon7.cho <jaewon7.cho@samsung.com>
“Bumseung [Fri, 29 Mar 2013 07:49:26 +0000 (16:49 +0900)]
Resource manager refactoring
Change-Id: I11c40c1476733a6ce393cd78edaa691e58d04e13
Signed-off-by: “Bumseung <bumseung.cho@samsung.com>
SangYong Lee [Fri, 29 Mar 2013 07:34:31 +0000 (16:34 +0900)]
Modified initialization of TableViewItem height list when calling UpdateTableView
Change-Id: I1752443fdd2f55948a02d1ce5c7123f35995b641
Signed-off-by: SangYong Lee <sangyongim.lee@samsung.com>
Chulheon [Fri, 29 Mar 2013 07:19:13 +0000 (16:19 +0900)]
fixed bug (Dictionary B/S, copy&paste bug, add OEM_1 keycode for Clipboard)
Change-Id: I859959264fbd929ffec474a57ea018357e57d96e
DongJinJeon [Fri, 29 Mar 2013 06:49:24 +0000 (15:49 +0900)]
Fixed N_SE-30446
Change-Id: I34f912869657b0cac099ec68e40d624912139dde
Signed-off-by: DongJinJeon <dongjin2193.jeon@samsung.com>
youseong.ji [Fri, 29 Mar 2013 06:42:09 +0000 (15:42 +0900)]
Merge "Modified to work properly for item set bounds" into tizen_2.1
Kang Hee Ju [Fri, 29 Mar 2013 06:13:57 +0000 (15:13 +0900)]
Merge "Fix deleting controls order defect" into tizen_2.1
Bongjoo Seo [Fri, 29 Mar 2013 06:07:09 +0000 (15:07 +0900)]
Merge "Applied an workaround code regarding evas source visibility" into tizen_2.1
Bongjoo Seo [Fri, 29 Mar 2013 05:58:20 +0000 (14:58 +0900)]
Applied an workaround code regarding evas source visibility
Change-Id: I2c5852c31f9da7f02226094b8100cc23b03489ac
Signed-off-by: Bongjoo Seo <bongjoo.seo@samsung.com>
jaewon7.cho [Thu, 28 Mar 2013 08:56:43 +0000 (17:56 +0900)]
Fix deleting controls order defect
Change-Id: I46ac000a7d47f0b9bc5cb3edfca2a46bc438353a
Signed-off-by: jaewon7.cho <jaewon7.cho@samsung.com>
MyungJinKim [Fri, 29 Mar 2013 05:44:26 +0000 (14:44 +0900)]
Merge "Apply user changed text size, then multiline text size changed too." into tizen_2.1
Myung Jin Kim [Fri, 29 Mar 2013 05:44:21 +0000 (14:44 +0900)]
fix setfont logic
Change-Id: Ia84e6c159000e43e85e37839f64405916d9c8323
DongJinJeon [Fri, 29 Mar 2013 05:33:58 +0000 (14:33 +0900)]
modify client area of popup
Change-Id: I0e445fd5cf2d103ee5678c39210b5d04125add5e
Signed-off-by: DongJinJeon <dongjin2193.jeon@samsung.com>
youseong.ji [Fri, 29 Mar 2013 05:07:06 +0000 (14:07 +0900)]
Modified to work properly for item set bounds
Change-Id: I91766f19da817defb77c79b72c4081478955f909
Signed-off-by: youseong.ji <youseong.ji@samsung.com>
DongJinJeon [Fri, 29 Mar 2013 05:02:03 +0000 (14:02 +0900)]
Merge "add OnBoundsChanging() on Popup" into tizen_2.1
Keuckdo Bang [Fri, 29 Mar 2013 04:35:53 +0000 (13:35 +0900)]
Apply verified doxygen comment.
Change-Id: I13513799d92305e6f860dbdcd4269540dfd80efc
Taejun [Fri, 29 Mar 2013 04:29:36 +0000 (13:29 +0900)]
Merge "Fix rotate error in SearchBar" into tizen_2.1
Kang Hee Ju [Fri, 29 Mar 2013 04:29:17 +0000 (13:29 +0900)]
Merge "Remove unnecessary log." into tizen_2.1
DongJinJeon [Fri, 29 Mar 2013 04:21:59 +0000 (13:21 +0900)]
add OnBoundsChanging() on Popup
Change-Id: I4929db1f945af7c7351831ea21b19b93537b9468
Signed-off-by: DongJinJeon <dongjin2193.jeon@samsung.com>
Taejun [Fri, 29 Mar 2013 04:20:38 +0000 (13:20 +0900)]
Fix rotate error in SearchBar
Change-Id: I3a0d6fa9ed28d329c7bb08826c28bf0d9deea121