framework/uifw/elementary.git
12 years agoMerge "[Copy&Paste] Fix Windows Build Error"
Shinwoo Kim [Thu, 15 Mar 2012 09:04:09 +0000 (18:04 +0900)]
Merge "[Copy&Paste] Fix Windows Build Error"

12 years agoRemoving TC for editfield
WooHyun Jung [Thu, 15 Mar 2012 08:47:55 +0000 (17:47 +0900)]
Removing TC for editfield

12 years ago[Copy&Paste] Fix Windows Build Error
Shinwoo Kim [Thu, 15 Mar 2012 08:18:57 +0000 (17:18 +0900)]
[Copy&Paste] Fix Windows Build Error

Change-Id: I15a2eb3b63e825f924ce233362db68b4303b0178

12 years agoMerge "removed pagecontrol tc"
ChunEon Park [Thu, 15 Mar 2012 08:03:04 +0000 (17:03 +0900)]
Merge "removed pagecontrol tc"

12 years agoMerge "[*][elm_main] fix wrong return + wrong function call"
WooHyun Jung [Thu, 15 Mar 2012 06:36:41 +0000 (15:36 +0900)]
Merge "[*][elm_main] fix wrong return + wrong function call"

12 years agoremoved pagecontrol tc
ChunEon Park [Thu, 15 Mar 2012 06:03:14 +0000 (15:03 +0900)]
removed pagecontrol tc

12 years ago[*][naviframe] merge with 69354 for fixing focus problem when popping
WooHyun Jung [Thu, 15 Mar 2012 05:51:31 +0000 (14:51 +0900)]
[*][naviframe] merge with 69354 for fixing focus problem when popping

12 years ago[*][elm_main] fix wrong return + wrong function call
WooHyun Jung [Thu, 15 Mar 2012 05:48:49 +0000 (14:48 +0900)]
[*][elm_main] fix wrong return + wrong function call

12 years agoMerge "[Popup] Fixed the scaling issue related to theme_hook"
Rajeev Ranjan [Thu, 15 Mar 2012 04:53:17 +0000 (13:53 +0900)]
Merge "[Popup] Fixed the scaling issue related to theme_hook"

12 years ago[*][entry] merge with 69324 for fixing dimming problem when anchor is clicked
WooHyun Jung [Wed, 14 Mar 2012 08:44:59 +0000 (17:44 +0900)]
[*][entry] merge with 69324 for fixing dimming problem when anchor is clicked

12 years ago[Genlist][Bugfix] Group title is not display
Jung Chanwook [Wed, 14 Mar 2012 07:54:21 +0000 (16:54 +0900)]
[Genlist][Bugfix] Group title is not display

Change-Id: I4eb7e52ae3283882579d6e66d8cf3f0bee883f36

12 years ago[Popup] Fixed the scaling issue related to theme_hook
Rajeev Ranjan [Wed, 14 Mar 2012 07:44:15 +0000 (13:14 +0530)]
[Popup] Fixed the scaling issue related to theme_hook

12 years agoPackage upload
Jaehwan Kim [Tue, 13 Mar 2012 23:57:12 +0000 (08:57 +0900)]
Package upload

Change-Id: Ia77d1e501eb0a74d3523a2b18762022e8ea9b5f7

12 years ago[*] Remove controlbar
Jaehwan Kim [Tue, 13 Mar 2012 23:52:21 +0000 (08:52 +0900)]
[*] Remove controlbar

12 years agoPackage upload
Jeonghyun Yun [Tue, 13 Mar 2012 10:37:25 +0000 (19:37 +0900)]
Package upload

Change-Id: I3590d0d04376ff8727b01bae00cb471c7001cb85

12 years agoelm genlist/gengrid: Fixed item signal emit hook bug.
seoz [Tue, 13 Mar 2012 08:54:33 +0000 (08:54 +0000)]
elm genlist/gengrid: Fixed item signal emit hook bug.

Signed-off-by: Daniel Juyung Seo <juyung.seo@samsung.com>
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@69290 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

12 years agoMerge "[genlist] bugfix decorate mode double tap"
Hyoyoung Chang [Tue, 13 Mar 2012 09:03:23 +0000 (18:03 +0900)]
Merge "[genlist] bugfix decorate mode double tap"

12 years ago[datetime_ctxpopup_module] Dismissed_cb is changed as per the new Ctxpopup bug fix.
Jeonghyun Yun [Tue, 13 Mar 2012 07:28:56 +0000 (16:28 +0900)]
[datetime_ctxpopup_module] Dismissed_cb is changed as per the new Ctxpopup bug fix.

12 years ago[genlist] bugfix decorate mode double tap
Hyoyoung Chang [Tue, 13 Mar 2012 05:14:58 +0000 (14:14 +0900)]
[genlist] bugfix decorate mode double tap

12 years agoElementary migration revision 69026
Jeonghyun Yun [Tue, 13 Mar 2012 02:23:06 +0000 (11:23 +0900)]
Elementary migration revision 69026
Merge remote-tracking branch 'remotes/origin/intefl/svn_merge'

Conflicts:
src/lib/elm_index.c
src/lib/elm_index.h
src/lib/elm_label.c

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
ChunEon Park [Tue, 13 Mar 2012 01:10:55 +0000 (10:10 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge

12 years agoctxpopup - hide ctxpopup obj after it's dimissed
ChunEon Park [Tue, 13 Mar 2012 01:09:37 +0000 (10:09 +0900)]
ctxpopup - hide ctxpopup obj after it's dimissed

12 years agogengrid updated
Jeonghyun Yun [Tue, 13 Mar 2012 01:09:26 +0000 (10:09 +0900)]
gengrid updated

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
Jung Chanwook [Tue, 13 Mar 2012 00:53:44 +0000 (09:53 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge

12 years ago[genlist,gengrid] upstream merge
Jung Chanwook [Tue, 13 Mar 2012 00:53:37 +0000 (09:53 +0900)]
[genlist,gengrid] upstream merge

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
sumanth [Mon, 12 Mar 2012 14:42:19 +0000 (20:12 +0530)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge

12 years ago[elm_conformant.c] default contetnt part is removed.
sumanth [Mon, 12 Mar 2012 14:35:26 +0000 (20:05 +0530)]
[elm_conformant.c] default contetnt part is removed.

12 years ago[elm_conformant.c] default contetnt part is removed.
sumanth [Mon, 12 Mar 2012 14:35:26 +0000 (20:05 +0530)]
[elm_conformant.c] default contetnt part is removed.

12 years ago[elm_conform]: content area get removed instead content_set is used, popup can use...
sumanth [Mon, 12 Mar 2012 13:48:41 +0000 (19:18 +0530)]
[elm_conform]: content area get removed instead content_set is used, popup can use elm_object_content_get instead of content_area_get

12 years agoelementary/index - fixed null string case segfault
ChunEon Park [Mon, 12 Mar 2012 11:12:34 +0000 (20:12 +0900)]
elementary/index - fixed null string case segfault

12 years ago[datetime_input_ctxpopup.c] Hide ctxpopup in dismissed_cb().
sumanth [Mon, 12 Mar 2012 10:52:51 +0000 (16:22 +0530)]
[datetime_input_ctxpopup.c] Hide ctxpopup in dismissed_cb().

12 years agoDelete the object, when the item is deleted.
Jaehwan Kim [Mon, 12 Mar 2012 09:20:48 +0000 (18:20 +0900)]
Delete the object, when the item is deleted.

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
Jaehwan Kim [Mon, 12 Mar 2012 09:20:17 +0000 (18:20 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge

12 years ago[Map] Temporary bug fix. It will be merged to upstream ASAP.
Tae-Hwan Kim [Mon, 12 Mar 2012 08:01:48 +0000 (17:01 +0900)]
[Map] Temporary bug fix. It will be merged to upstream ASAP.

Change-Id: Id829e291d6eb854d4821ea96e8da642f058f96f5

12 years ago[Map] Temporary bug fix. It will be merged to upstream ASAP.
Tae-Hwan Kim [Mon, 12 Mar 2012 08:01:48 +0000 (17:01 +0900)]
[Map] Temporary bug fix. It will be merged to upstream ASAP.

Change-Id: Id829e291d6eb854d4821ea96e8da642f058f96f5

12 years ago[genlist] minor fix indent
Hyoyoung Chang [Mon, 12 Mar 2012 07:36:48 +0000 (16:36 +0900)]
[genlist] minor fix indent

12 years ago[genlist] minor code indent fix
Hyoyoung Chang [Mon, 12 Mar 2012 06:55:22 +0000 (15:55 +0900)]
[genlist] minor code indent fix

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
Hyoyoung Chang [Mon, 12 Mar 2012 06:06:19 +0000 (15:06 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge

12 years ago[genlist] bugfix decorate_all mode sizing problem
Hyoyoung Chang [Mon, 12 Mar 2012 06:06:00 +0000 (15:06 +0900)]
[genlist] bugfix decorate_all mode sizing problem

12 years agotickernoti temp added
Jeonghyun Yun [Mon, 12 Mar 2012 05:52:46 +0000 (14:52 +0900)]
tickernoti temp added

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
Shinwoo Kim [Mon, 12 Mar 2012 05:22:22 +0000 (14:22 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge

12 years ago[diskselector] opensource merge - fix datetime issue
Shinwoo Kim [Mon, 12 Mar 2012 05:22:11 +0000 (14:22 +0900)]
[diskselector] opensource merge - fix datetime issue

12 years ago[genlist] merged with upstream
Hyoyoung Chang [Mon, 12 Mar 2012 04:59:26 +0000 (13:59 +0900)]
[genlist] merged with upstream

12 years ago[genlist] change old item style to current naming
Hyoyoung Chang [Mon, 12 Mar 2012 04:26:38 +0000 (13:26 +0900)]
[genlist] change old item style to current naming

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
Hyoyoung Chang [Mon, 12 Mar 2012 02:05:46 +0000 (11:05 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge

12 years ago[genlist] naming change - edit_mode->decorate_mode
Hyoyoung Chang [Mon, 12 Mar 2012 02:05:20 +0000 (11:05 +0900)]
[genlist] naming change - edit_mode->decorate_mode

12 years ago[*][naviframe] fix focus problem
WooHyun Jung [Mon, 12 Mar 2012 01:58:18 +0000 (10:58 +0900)]
[*][naviframe] fix focus problem

12 years ago[genlist] edit mode
Jung Chanwook [Mon, 12 Mar 2012 01:45:31 +0000 (10:45 +0900)]
[genlist] edit mode

12 years agoconfig - updated to sync with opensource code
ChunEon Park [Sun, 11 Mar 2012 13:12:38 +0000 (22:12 +0900)]
config - updated to sync with opensource code

12 years agocontrolbar error fixed
Jeonghyun Yun [Sun, 11 Mar 2012 11:39:48 +0000 (20:39 +0900)]
controlbar error fixed

12 years agocontrolbar added
Jeonghyun Yun [Sun, 11 Mar 2012 11:32:06 +0000 (20:32 +0900)]
controlbar added

12 years agoRemove controlbar, use toolbar instead
Tae-Hwan Kim [Sun, 11 Mar 2012 07:51:17 +0000 (16:51 +0900)]
Remove controlbar, use toolbar instead

Change-Id: I2890670da90ce8c053a6a56a372fa928761a75ba

12 years agoRemove unused files (elm_popup --> elc_popup)
Tae-Hwan Kim [Sun, 11 Mar 2012 06:56:02 +0000 (15:56 +0900)]
Remove unused files (elm_popup --> elc_popup)

Change-Id: I3fe0afbd7a2ec2410122bcabacd8924fe62055f5

12 years agoadd the emit for efl-theme-tizen
Jaehwan Kim [Fri, 9 Mar 2012 06:48:20 +0000 (15:48 +0900)]
add the emit for efl-theme-tizen

12 years ago[elm_colorselector]: take padding values on theme change.
shilpa singh [Sat, 10 Mar 2012 13:14:10 +0000 (18:44 +0530)]
[elm_colorselector]: take padding values on theme change.

12 years ago[dayselector]: demo code modified to support sunday
shilpa singh [Sat, 10 Mar 2012 12:18:07 +0000 (17:48 +0530)]
[dayselector]: demo code modified to support sunday

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
shilpa singh [Sat, 10 Mar 2012 06:34:05 +0000 (12:04 +0530)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge

12 years ago[elm_colorselector]: merged from Opensource 2. config/slp updated with
shilpa singh [Sat, 10 Mar 2012 06:32:33 +0000 (12:02 +0530)]
[elm_colorselector]: merged from Opensource 2. config/slp updated with
dayselector and colorselector parameters

12 years agoelemenatry/naviframe - removed unsupported item signal callbacks
ChunEon Park [Sat, 10 Mar 2012 06:27:07 +0000 (15:27 +0900)]
elemenatry/naviframe - removed unsupported item signal callbacks

12 years agoPackage upload REL_F_I9500_20120313_1
Jeonghyun Yun [Sat, 10 Mar 2012 04:30:12 +0000 (13:30 +0900)]
Package upload

Change-Id: I192f9cb709f097f307694edf7bb282651e7f279b

12 years agochanged edje_object_part_text_style_user_set to edje_object_part_text_style_user_push
Jeonghyun Yun [Sat, 10 Mar 2012 04:27:46 +0000 (13:27 +0900)]
changed edje_object_part_text_style_user_set to edje_object_part_text_style_user_push

12 years agoAdd WRAPPER for booting
Myoungwoon Kim [Sat, 10 Mar 2012 03:52:44 +0000 (12:52 +0900)]
Add WRAPPER for booting

12 years agorepackaging - elementary_1.0.0+svn.67547slp2+build15
ChunEon Park [Sat, 10 Mar 2012 03:43:51 +0000 (12:43 +0900)]
repackaging - elementary_1.0.0+svn.67547slp2+build15

12 years agoMerge "elementary/index - merged with opensource for page control"
ChunEon Park [Sat, 10 Mar 2012 02:55:03 +0000 (11:55 +0900)]
Merge "elementary/index - merged with opensource for page control"

12 years agoelm_fonts.h removed
Jeonghyun Yun [Sat, 10 Mar 2012 02:14:34 +0000 (11:14 +0900)]
elm_fonts.h removed

12 years agoelementary/index - merged with opensource for page control
ChunEon Park [Fri, 9 Mar 2012 12:45:16 +0000 (21:45 +0900)]
elementary/index - merged with opensource for page control

Change-Id: I4799da7f1b090fb1a906e370eeef7ee724af91f1

12 years agofix build error - elm_entry
Jaehwan Kim [Fri, 9 Mar 2012 10:22:02 +0000 (19:22 +0900)]
fix build error - elm_entry

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
Jaehwan Kim [Fri, 9 Mar 2012 10:00:02 +0000 (19:00 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge

12 years agofix build error - elm_controlbar.c
Jaehwan Kim [Fri, 9 Mar 2012 09:59:47 +0000 (18:59 +0900)]
fix build error - elm_controlbar.c

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
WooHyun Jung [Fri, 9 Mar 2012 09:07:30 +0000 (18:07 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge

12 years ago[Entry] magnifier codes are added again
WooHyun Jung [Fri, 9 Mar 2012 09:07:25 +0000 (18:07 +0900)]
[Entry] magnifier codes are added again

12 years agoRemoved APIs are added in elm_removed.h
sumanth [Fri, 9 Mar 2012 09:05:29 +0000 (14:35 +0530)]
Removed APIs are added in elm_removed.h

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
Jung Chanwook [Fri, 9 Mar 2012 08:13:24 +0000 (17:13 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge

12 years ago[genlist] fix the build error
Jung Chanwook [Fri, 9 Mar 2012 08:13:16 +0000 (17:13 +0900)]
[genlist] fix the  build error

12 years ago[dayselector] elm_dayselector.c, elm_dayselector.h files are removed. Datetime, Dayse...
sumanth [Fri, 9 Mar 2012 08:11:37 +0000 (13:41 +0530)]
[dayselector] elm_dayselector.c, elm_dayselector.h files are removed. Datetime, Dayselector test cases are removed.

12 years agofix build break in elm_entry
WooHyun Jung [Fri, 9 Mar 2012 07:06:48 +0000 (16:06 +0900)]
fix build break in elm_entry

12 years agoadd the emit for efl-theme-tizen
Jaehwan Kim [Fri, 9 Mar 2012 06:48:20 +0000 (15:48 +0900)]
add the emit for efl-theme-tizen

12 years ago[ctxpopup] fix build error which is from fixing merge
Shinwoo Kim [Fri, 9 Mar 2012 06:30:10 +0000 (15:30 +0900)]
[ctxpopup] fix build error which is from fixing merge

12 years agoFix conflicts: Map, Hover, Hoversel, Menu, Web
Tae-Hwan Kim [Fri, 9 Mar 2012 06:21:21 +0000 (15:21 +0900)]
Fix conflicts: Map, Hover, Hoversel, Menu, Web

Change-Id: I5c6d681cfaf2b5430a56aa15ffb8fe67f70e113e

12 years agofix conflict test_cursor.c
Jaehwan Kim [Fri, 9 Mar 2012 06:19:29 +0000 (15:19 +0900)]
fix conflict test_cursor.c

12 years ago[actionslider,calendar,conform] Deprecated API support is deleted from the widgets.
sumanth [Fri, 9 Mar 2012 06:19:29 +0000 (11:49 +0530)]
[actionslider,calendar,conform] Deprecated API support is deleted from the widgets.

12 years agofix conflict test_focus.c
Jaehwan Kim [Fri, 9 Mar 2012 06:11:16 +0000 (15:11 +0900)]
fix conflict test_focus.c

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
sumanth [Fri, 9 Mar 2012 06:00:15 +0000 (11:30 +0530)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge

12 years ago[svn merge <sumanth>] actionslider,calendar,clock,conformant,slider widgets related...
sumanth [Fri, 9 Mar 2012 05:57:50 +0000 (11:27 +0530)]
[svn merge <sumanth>] actionslider,calendar,clock,conformant,slider widgets related merge conflicts are fixed.

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
Jung Chanwook [Fri, 9 Mar 2012 05:47:51 +0000 (14:47 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge

12 years ago[Genlist] test_genlist.c upstream merge
Jung Chanwook [Fri, 9 Mar 2012 05:47:45 +0000 (14:47 +0900)]
[Genlist] test_genlist.c upstream merge

12 years ago3d, gesturelayer, index, naviframe, transit, fileselector, frame, glview, layout...
ChunEon Park [Fri, 9 Mar 2012 05:14:46 +0000 (14:14 +0900)]
3d, gesturelayer, index, naviframe, transit, fileselector, frame, glview, layout - removed conflicsts

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
Jiyoun Park [Fri, 9 Mar 2012 03:16:51 +0000 (12:16 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge

12 years agomigration merge<Jiyoun Park>
Jiyoun Park [Fri, 9 Mar 2012 03:01:46 +0000 (12:01 +0900)]
migration merge<Jiyoun Park>

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
Shinwoo Kim [Fri, 9 Mar 2012 02:37:39 +0000 (11:37 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge

12 years ago[Migration] Conflict Fix: ctxpopup, diskselector, flipselector, spinner, tooltip...
Shinwoo Kim [Fri, 9 Mar 2012 02:37:23 +0000 (11:37 +0900)]
[Migration] Conflict Fix: ctxpopup, diskselector, flipselector, spinner, tooltip (lib only)

12 years ago[label]merged with opensource(elm_label.c)
Goun Lee [Fri, 9 Mar 2012 01:20:15 +0000 (10:20 +0900)]
[label]merged with opensource(elm_label.c)

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:21922/slp/pkgs/e/elementary...
Goun Lee [Fri, 9 Mar 2012 01:14:02 +0000 (10:14 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:21922/slp/pkgs/e/elementary into intefl/svn_merge

12 years ago[genlist] merge samsung feature
Jung Chanwook [Fri, 9 Mar 2012 01:04:55 +0000 (10:04 +0900)]
[genlist] merge samsung feature

12 years agoelementary merging.
shilpa singh [Thu, 8 Mar 2012 13:18:50 +0000 (18:48 +0530)]
elementary merging.

12 years ago[Migration] Conflict Fix: ctxpopup, diskselector, flipselector, spinner, tooltip...
Shinwoo Kim [Thu, 8 Mar 2012 13:08:01 +0000 (22:08 +0900)]
[Migration] Conflict Fix: ctxpopup, diskselector, flipselector, spinner, tooltip (theme, doc and bin only)

12 years agoMerge branch 'intefl/svn_merge' of 165.213.149.219:/slp/pkgs/e/elementary into intefl...
minseok3.kim [Thu, 8 Mar 2012 12:14:17 +0000 (21:14 +0900)]
Merge branch 'intefl/svn_merge' of 165.213.149.219:/slp/pkgs/e/elementary into intefl/svn_merge

12 years ago[cnp] merge with opensource
minseok3.kim [Thu, 8 Mar 2012 12:03:22 +0000 (21:03 +0900)]
[cnp] merge with opensource

12 years agosrc/lib conflict fixed
Jeonghyun Yun [Thu, 8 Mar 2012 11:38:36 +0000 (20:38 +0900)]
src/lib conflict fixed

12 years ago[Elementary migration] panes,flip,notify and slideshow widgets merged.
Rajeev Ranjan [Thu, 8 Mar 2012 11:19:39 +0000 (16:49 +0530)]
[Elementary migration] panes,flip,notify and slideshow widgets merged.