framework/uifw/elementary.git
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 agoAdd WRAPPER for booting
Myoungwoon Kim [Sat, 10 Mar 2012 03:52:44 +0000 (12:52 +0900)]
Add WRAPPER for booting

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 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 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.

12 years agoMerge "elm toolbar: Formatting."
Jaehwan Kim [Thu, 8 Mar 2012 11:02:11 +0000 (20:02 +0900)]
Merge "elm toolbar: Formatting."

12 years agoMerge "warn+bug--"
Jaehwan Kim [Thu, 8 Mar 2012 11:02:04 +0000 (20:02 +0900)]
Merge "warn+bug--"

12 years ago[index]Fixed conflicts (elm_index.c/elm_index.h)
Goun Lee [Thu, 8 Mar 2012 10:44:30 +0000 (19:44 +0900)]
[index]Fixed conflicts (elm_index.c/elm_index.h)

12 years ago[index]Fixed Conflicts
Goun Lee [Thu, 8 Mar 2012 10:40:38 +0000 (19:40 +0900)]
[index]Fixed Conflicts

12 years ago[multibuttonentry]Fixed Conflicts
Goun Lee [Thu, 8 Mar 2012 10:27:56 +0000 (19:27 +0900)]
[multibuttonentry]Fixed Conflicts

12 years agoSVN Merging for button, radio, check and toggle
Rajeev Ranjan [Thu, 8 Mar 2012 09:51:18 +0000 (15:21 +0530)]
SVN Merging for button, radio, check and toggle

12 years agosrc/lib conflict fixed
Jeonghyun Yun [Thu, 8 Mar 2012 09:06:40 +0000 (18:06 +0900)]
src/lib conflict fixed

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
Myungjae Lee [Thu, 8 Mar 2012 08:52:10 +0000 (17:52 +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] fixed conflicts in files
Myungjae Lee [Thu, 8 Mar 2012 08:52:07 +0000 (17:52 +0900)]
[migration] fixed conflicts in files

Change-Id: I0ffdf0db632e66a6b097627a19712a1208a4e2d0

12 years ago[genlist] merge upstream 2nd
Jung Chanwook [Thu, 8 Mar 2012 08:32:33 +0000 (17:32 +0900)]
[genlist] merge upstream 2nd

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

12 years ago[elm_genlist.c] merge upstream 1st
Jung Chanwook [Thu, 8 Mar 2012 08:28:18 +0000 (17:28 +0900)]
[elm_genlist.c] merge upstream 1st

12 years ago[migration] fixed conflicts in files
Myungjae Lee [Thu, 8 Mar 2012 08:23:44 +0000 (17:23 +0900)]
[migration] fixed conflicts in files

Change-Id: Iac202669ab393604b35fc32f826dafcc5d05ea44

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
WooHyun Jung [Thu, 8 Mar 2012 07:47:09 +0000 (16: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[Entry] elm_entry.h merge finished
WooHyun Jung [Thu, 8 Mar 2012 07:47:03 +0000 (16:47 +0900)]
[Entry] elm_entry.h merge finished

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
Hyoyoung Chang [Thu, 8 Mar 2012 07:33:29 +0000 (16:33 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
Jeonghyun Yun [Thu, 8 Mar 2012 07:33:16 +0000 (16:33 +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] merge with local source
Hyoyoung Chang [Thu, 8 Mar 2012 07:33:12 +0000 (16:33 +0900)]
[genlist] merge with local source

Change-Id: Ieb665cfa1e5bfa747609f60d09591bfc1954a85e

12 years agosrc/examples conflict fixed
Jeonghyun Yun [Thu, 8 Mar 2012 07:33:09 +0000 (16:33 +0900)]
src/examples conflict fixed

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
WooHyun Jung [Thu, 8 Mar 2012 07:32:24 +0000 (16:32 +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] merge finished
WooHyun Jung [Thu, 8 Mar 2012 07:32:19 +0000 (16:32 +0900)]
[entry] merge finished

12 years agosrc/bin src/edje_external conflict fixed
Jeonghyun Yun [Thu, 8 Mar 2012 07:22:56 +0000 (16:22 +0900)]
src/bin src/edje_external conflict fixed

12 years ago[genlist] no scale at theme_hook
Hyoyoung Chang [Thu, 8 Mar 2012 07:19:21 +0000 (16:19 +0900)]
[genlist] no scale at theme_hook

Change-Id: I0bfb156dafc5cf3a2c212e20370ba9643bcb950c

12 years ago[genlist] remove focus at flipped mode
Hyoyoung Chang [Thu, 8 Mar 2012 07:18:37 +0000 (16:18 +0900)]
[genlist] remove focus at flipped mode

Change-Id: I57d10f5e7ac3835f012840bc86f95aa16cfbd29f

12 years ago[genlist] add changed_job, can_focus, calc_job checking
Hyoyoung Chang [Thu, 8 Mar 2012 07:16:35 +0000 (16:16 +0900)]
[genlist] add changed_job, can_focus, calc_job checking

Change-Id: I162ed62ee6617b4a233663ef5c00057be614d6a7

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
Hyoyoung Chang [Thu, 8 Mar 2012 06:53:52 +0000 (15: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] merge with upstream
Hyoyoung Chang [Thu, 8 Mar 2012 06:53:32 +0000 (15:53 +0900)]
[genlist] merge with upstream

Change-Id: Ie3adac9c00f3d5ebc63735e6d7cc336feba743f9

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
Jeonghyun Yun [Thu, 8 Mar 2012 06:35:09 +0000 (15:35 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge

12 years agomodified
Jeonghyun Yun [Thu, 8 Mar 2012 06:35:03 +0000 (15:35 +0900)]
modified

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

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

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

12 years agofix conflicted files - toolbar, scroller
Jaehwan Kim [Thu, 8 Mar 2012 05:51:34 +0000 (14:51 +0900)]
fix conflicted files - toolbar, scroller

12 years ago[genlist, gen, gen_common] merge upstream except for elm_genlist.c
Jung Chanwook [Thu, 8 Mar 2012 05:50:29 +0000 (14:50 +0900)]
[genlist, gen, gen_common] merge upstream except for elm_genlist.c

12 years agoMerge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...
WooHyun Jung [Thu, 8 Mar 2012 05:38:04 +0000 (14:38 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge

12 years ago[JungWooHyun] doing merge job ~
WooHyun Jung [Thu, 8 Mar 2012 05:37:37 +0000 (14:37 +0900)]
[JungWooHyun] doing merge job ~

12 years agodeleted and modified
Jeonghyun Yun [Thu, 8 Mar 2012 05:26:45 +0000 (14:26 +0900)]
deleted and modified

12 years ago[factory, list, store] merge upstream
Hyoyoung Chang [Thu, 8 Mar 2012 05:12:54 +0000 (14:12 +0900)]
[factory, list, store] merge upstream

Change-Id: Ibd044be97197011922916148f265d869da5bf9a0

12 years ago[bubble, factory, store, pan] merge upstream
Hyoyoung Chang [Thu, 8 Mar 2012 05:09:11 +0000 (14:09 +0900)]
[bubble, factory, store, pan] merge upstream

Change-Id: Ib9963cccbec0c5734512e59e2defb14a3afd8712

12 years agoAUTHORS modified
Jeonghyun Yun [Thu, 8 Mar 2012 04:30:18 +0000 (13:30 +0900)]
AUTHORS modified

12 years agoMerge remote-tracking branch 'remotes/origin/upstream'
Jeonghyun Yun [Thu, 8 Mar 2012 03:09:23 +0000 (12:09 +0900)]
Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
.gitignore
AUTHORS
README
config/Makefile.am
config/default/base.src
config/illume/base.src
config/standard/base.src
configure.ac
data/edje_externals/Makefile.am
data/edje_externals/icons.edc
data/images/Makefile.am
data/objects/test.edc
data/themes/Makefile.am
data/themes/default.edc
data/themes/widgets/button.edc
data/themes/widgets/ctxpopup.edc
data/themes/widgets/entry.edc
data/themes/widgets/flipselector.edc
data/themes/widgets/genlist.edc
data/themes/widgets/index.edc
data/themes/widgets/label.edc
data/themes/widgets/map.edc
data/themes/widgets/naviframe.edc
data/themes/widgets/panel.edc
data/themes/widgets/panes.edc
data/themes/widgets/toolbar.edc
doc/Makefile.am
doc/examples.dox
doc/index.doxy
doc/widgets/Makefile.am
doc/widgets/widget_preview_ctxpopup.c
doc/widgets/widget_preview_flip.c
doc/widgets/widget_preview_genlist1.c
doc/widgets/widget_preview_icon.c
doc/widgets/widget_preview_image.c
doc/widgets/widget_preview_index.c
doc/widgets/widget_preview_mapbuf.c
elementary.spec.in
m4/efl_binary.m4
po/POTFILES.in
po/ar.po
po/az_IR.po
po/cs.po
po/de.po
po/fa.po
po/fr.po
po/he.po
po/it.po
po/ko_KR.po
po/nl.po
po/ps.po
po/pt.po
po/ur.po
po/yi.po
src/bin/Makefile.am
src/bin/config.c
src/bin/quicklaunch.c
src/bin/test.c
src/bin/test_3d.c
src/bin/test_actionslider.c
src/bin/test_bg.c
src/bin/test_box.c
src/bin/test_bubble.c
src/bin/test_button.c
src/bin/test_calendar.c
src/bin/test_check.c
src/bin/test_clock.c
src/bin/test_cnp.c
src/bin/test_colorselector.c
src/bin/test_conform.c
src/bin/test_ctxpopup.c
src/bin/test_cursor.c
src/bin/test_diskselector.c
src/bin/test_eio.c
src/bin/test_entry.c
src/bin/test_factory.c
src/bin/test_fileselector_button.c
src/bin/test_fileselector_entry.c
src/bin/test_flip.c
src/bin/test_flip_page.c
src/bin/test_flipselector.c
src/bin/test_focus.c
src/bin/test_focus2.c
src/bin/test_focus3.c
src/bin/test_gengrid.c
src/bin/test_genlist.c
src/bin/test_gesture_layer2.c
src/bin/test_gesture_layer3.c
src/bin/test_glview.c
src/bin/test_glview_simple.c
src/bin/test_grid.c
src/bin/test_hover.c
src/bin/test_hoversel.c
src/bin/test_icon.c
src/bin/test_icon_animated.c
src/bin/test_index.c
src/bin/test_inwin.c
src/bin/test_label.c
src/bin/test_launcher.c
src/bin/test_list.c
src/bin/test_map.c
src/bin/test_menu.c
src/bin/test_multibuttonentry.c
src/bin/test_naviframe.c
src/bin/test_notify.c
src/bin/test_panel.c
src/bin/test_photo.c
src/bin/test_photocam.c
src/bin/test_radio.c
src/bin/test_scroller.c
src/bin/test_separator.c
src/bin/test_spinner.c
src/bin/test_store.c
src/bin/test_table.c
src/bin/test_toggle.c
src/bin/test_toolbar.c
src/bin/test_tooltip.c
src/bin/test_transit.c
src/bin/test_weather.c
src/bin/test_web.c
src/bin/test_win_inline.c
src/bin/test_win_plug.c
src/bin/test_win_socket.c
src/bin/test_win_state.c
src/edje_externals/Makefile.am
src/edje_externals/elm.c
src/edje_externals/elm_button.c
src/edje_externals/elm_calendar.c
src/edje_externals/elm_entry.c
src/edje_externals/elm_gengrid.c
src/edje_externals/elm_genlist.c
src/edje_externals/elm_icon.c
src/edje_externals/elm_index.c
src/edje_externals/elm_list.c
src/edje_externals/elm_map.c
src/edje_externals/elm_multibuttonentry.c
src/edje_externals/elm_notify.c
src/edje_externals/elm_segment_control.c
src/edje_externals/elm_toolbar.c
src/edje_externals/elm_video.c
src/edje_externals/modules.inc
src/examples/Makefile.am
src/examples/anchorblock_example_01.c
src/examples/bubble_example_01.c
src/examples/button_example_01.c
src/examples/calendar_example_05.c
src/examples/clock_example.c
src/examples/ctxpopup_example_01.c
src/examples/diskselector_example_01.c
src/examples/entry_example.c
src/examples/flip_example_01.c
src/examples/general_funcs_example.c
src/examples/gengrid_example.c
src/examples/genlist_example_01.c
src/examples/genlist_example_02.c
src/examples/genlist_example_03.c
src/examples/genlist_example_04.c
src/examples/genlist_example_05.c
src/examples/icon_example_01.c
src/examples/image_example_01.c
src/examples/index_example_01.c
src/examples/index_example_02.c
src/examples/inwin_example.c
src/examples/list_example_02.c
src/examples/list_example_03.c
src/examples/map_example_01.c
src/examples/map_example_02.c
src/examples/map_example_03.c
src/examples/mapbuf_example.c
src/examples/menu_example_01.c
src/examples/photocam_example_01.c
src/examples/slider_example.c
src/examples/slideshow_example.c
src/examples/theme_example_01.c
src/examples/web_example.c
src/examples/win_example.c
src/lib/Elementary.h.in
src/lib/Makefile.am
src/lib/elc_ctxpopup.c
src/lib/elc_ctxpopup.h
src/lib/elc_fileselector.c
src/lib/elc_fileselector_button.c
src/lib/elc_fileselector_button.h
src/lib/elc_fileselector_entry.c
src/lib/elc_fileselector_entry.h
src/lib/elc_hoversel.c
src/lib/elc_hoversel.h
src/lib/elc_multibuttonentry.c
src/lib/elc_multibuttonentry.h
src/lib/elc_naviframe.c
src/lib/elc_naviframe.h
src/lib/elc_player.c
src/lib/elc_scrolled_entry.c
src/lib/elm_access.c
src/lib/elm_actionslider.c
src/lib/elm_actionslider.h
src/lib/elm_app.h
src/lib/elm_bg.c
src/lib/elm_bg.h
src/lib/elm_box.c
src/lib/elm_box.h
src/lib/elm_bubble.c
src/lib/elm_bubble.h
src/lib/elm_button.c
src/lib/elm_button.h
src/lib/elm_cache.h
src/lib/elm_calendar.c
src/lib/elm_calendar.h
src/lib/elm_check.c
src/lib/elm_check.h
src/lib/elm_clock.c
src/lib/elm_clock.h
src/lib/elm_cnp.h
src/lib/elm_colorselector.c
src/lib/elm_colorselector.h
src/lib/elm_config.c
src/lib/elm_config.h
src/lib/elm_conform.c
src/lib/elm_conform.h
src/lib/elm_cursor.h
src/lib/elm_debug.h
src/lib/elm_deprecated.h
src/lib/elm_diskselector.c
src/lib/elm_diskselector.h
src/lib/elm_entry.c
src/lib/elm_entry.h
src/lib/elm_factory.c
src/lib/elm_factory.h
src/lib/elm_finger.h
src/lib/elm_flip.c
src/lib/elm_flip.h
src/lib/elm_flipselector.c
src/lib/elm_flipselector.h
src/lib/elm_focus.h
src/lib/elm_font.c
src/lib/elm_frame.c
src/lib/elm_frame.h
src/lib/elm_gen.h
src/lib/elm_gen_common.h
src/lib/elm_general.h
src/lib/elm_gengrid.c
src/lib/elm_gengrid.h
src/lib/elm_genlist.c
src/lib/elm_genlist.h
src/lib/elm_gesture_layer.c
src/lib/elm_gesture_layer.h
src/lib/elm_getting_started.h
src/lib/elm_glview.c
src/lib/elm_glview.h
src/lib/elm_grid.c
src/lib/elm_grid.h
src/lib/elm_hover.c
src/lib/elm_hover.h
src/lib/elm_icon.c
src/lib/elm_icon.h
src/lib/elm_image.c
src/lib/elm_image.h
src/lib/elm_index.c
src/lib/elm_index.h
src/lib/elm_intro.h
src/lib/elm_label.c
src/lib/elm_label.h
src/lib/elm_layout.c
src/lib/elm_layout.h
src/lib/elm_list.c
src/lib/elm_list.h
src/lib/elm_main.c
src/lib/elm_map.c
src/lib/elm_map.h
src/lib/elm_mapbuf.c
src/lib/elm_mapbuf.h
src/lib/elm_menu.c
src/lib/elm_menu.h
src/lib/elm_mirroring.h
src/lib/elm_need.h
src/lib/elm_notify.c
src/lib/elm_notify.h
src/lib/elm_object.h
src/lib/elm_object_item.h
src/lib/elm_pager.c
src/lib/elm_panel.h
src/lib/elm_panes.c
src/lib/elm_panes.h
src/lib/elm_photo.c
src/lib/elm_photo.h
src/lib/elm_photocam.c
src/lib/elm_photocam.h
src/lib/elm_plug.c
src/lib/elm_plug.h
src/lib/elm_priv.h
src/lib/elm_progressbar.h
src/lib/elm_radio.c
src/lib/elm_radio.h
src/lib/elm_route.c
src/lib/elm_route.h
src/lib/elm_scale.h
src/lib/elm_scroll.h
src/lib/elm_scroller.c
src/lib/elm_scroller.h
src/lib/elm_segment_control.c
src/lib/elm_segment_control.h
src/lib/elm_slider.c
src/lib/elm_slider.h
src/lib/elm_slideshow.c
src/lib/elm_slideshow.h
src/lib/elm_spinner.c
src/lib/elm_spinner.h
src/lib/elm_store.c
src/lib/elm_store.h
src/lib/elm_table.h
src/lib/elm_theme.c
src/lib/elm_theme.h
src/lib/elm_thumb.c
src/lib/elm_thumb.h
src/lib/elm_toolbar.c
src/lib/elm_toolbar.h
src/lib/elm_tooltip.h
src/lib/elm_transit.c
src/lib/elm_transit.h
src/lib/elm_video.c
src/lib/elm_video.h
src/lib/elm_web.c
src/lib/elm_web.h
src/lib/elm_widget.c
src/lib/elm_widget.h
src/lib/elm_win.c
src/lib/elm_win.h
src/lib/els_cursor.c
src/lib/els_icon.c
src/lib/els_pan.c
src/lib/els_scroller.c
src/lib/els_tooltip.c
src/modules/Makefile.am
src/modules/access_output/Makefile.am
src/modules/test_map/mod.c

12 years agonow I'm not going to point any fingers here glima, but this was not the proper way...
discomfitor [Wed, 7 Mar 2012 20:01:17 +0000 (20:01 +0000)]
now I'm not going to point any fingers here glima, but this was not the proper way to use eina file and broke profile support in elm for the past year or so

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@69026 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33