rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=a503b8b5abab19ba7fa41bc03fda1690bea13146

commit a503b8b5abab19ba7fa41bc03fda1690bea13146
Merge: 6b9f758 92e01ea
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date:   Wed Dec 2 16:10:32 2015 +0200

    Merge branch 'master' from internal eflete repo

 configure.ac                                       |   8 +-
 data/themes/default/widgets/frame.edc              | 346 +--------
 data/themes/default/widgets/layout.edc             |  54 +-
 data/themes/default/widgets/layouts/property.edc   |  39 +
 src/bin/common/signals.h                           |  12 +-
 src/bin/common/widget_macro.h                      |   1 -
 src/bin/config/config.c                            |  11 +-
 src/bin/editor/diff.c                              |  13 +-
 src/bin/editor/diff.h                              |   1 +
 src/bin/editor/editor.h                            |   6 +
 src/bin/editor/editor_general.c                    |  41 +-
 src/bin/editor/editor_group.c                      |   7 +-
 src/bin/editor/editor_macro.h                      |  26 +-
 src/bin/editor/editor_part.c                       |  43 +-
 src/bin/editor/editor_states.c                     |  21 +-
 src/bin/editor/editor_text.c                       |   3 +-
 src/bin/ui/editors/sound_editor.c                  | 809 +--------------------
 src/bin/ui/editors/sound_editor.h                  |  19 +
 src/bin/ui/editors/style_editor.c                  |  37 +-
 src/bin/ui/group_navigator.c                       | 134 +++-
 src/bin/ui/main_window.c                           |   2 +
 src/bin/ui/popup.c                                 |  36 +-
 src/bin/ui/property.c                              |   3 +
 src/bin/ui/property_group.c                        | 157 ++--
 src/bin/ui/property_sound.c                        | 751 +++++++++++++++++--
 src/bin/ui/property_style.c                        |   4 +-
 src/bin/ui/workspace/groupedit.c                   | 194 ++---
 src/bin/ui/workspace/groupedit.h                   |  54 +-
 src/bin/ui/workspace/groupedit_calc.c              | 594 ++++++---------
 src/bin/ui/workspace/groupedit_private.h           |  42 +-
 src/bin/ui/workspace/workspace.c                   |  48 +-
 src/bin/ui/workspace/workspace.h                   |  25 -
 src/lib/ewe_ruler.c                                |   2 +-
 tests/Makefile.am                                  |   2 -
 tests/test_ui_workspace/test_ui_workspace.c        |   4 -
 tests/test_ui_workspace/test_ui_workspace.h        |   6 -
 .../workspace_edit_object_part_state_add.c         | 147 ----
 .../workspace_edit_object_part_state_del.c         | 158 ----
 38 files changed, 1476 insertions(+), 2384 deletions(-)

-- 


Reply via email to