[3.0] Version downgrade (1.2.0 to 1.1.45) 69/84669/6
authortaeyoon <taeyoon0.lee@samsung.com>
Mon, 22 Aug 2016 02:29:30 +0000 (11:29 +0900)
committerTaeyoon Lee <taeyoon0.lee@samsung.com>
Mon, 22 Aug 2016 05:51:27 +0000 (22:51 -0700)
commit3d19733419093778f0e7833eb1b51d36a1ea527f
tree5975726df23426dc6b8c5df078fdf8c292a56d80
parenta0e92a9491568cd1ad2232bc24b9856914b322f5
[3.0] Version downgrade (1.2.0 to 1.1.45)

  Final integration work for tizen 3.0 merged 1.2.0 dali in tizen branch.

  1.2.0 already includes new features (Public-APIs) for next tizen release.
  For tizen 3.0, we downgrade tizen branch to 1.1.45

This reverts commit 707333599e29423db3bf26b945f35bb3070897e0.

Conflicts:
packaging/dali-addon.spec

Revert "Preparation for minor version upgrade"

This reverts commit 19dfaca56bd409626a14b50d7d9cc22a958d93f4.

Revert "Batching clean-up"

This reverts commit afe38927f068846eaa02c374430da05f6209a6f9.

Revert "Adding ObjectDestructionTracker to dali-test-suite-utils for testing object destruction"

This reverts commit 56b4ea70c3d00b35bd517f532c5229902795bff6.

Revert "Geometry Batching"

This reverts commit f29b744f4c9d27aeb355319712313876bb236bca.

Revert "Added missing newline chars to logging commands"

This reverts commit 9ca43010ae274e019743c95a3bed73fd2e151bcd.

Revert "Adding RegisterVisual API to Control base class"

This reverts commit e14d00568eab69d46e78db427d91e33513fd662b.

Revert "Fix the broken build for JavaScript plugin"

This reverts commit 60e86925712d9ec15583644dddaba523c16e8882.

Revert "Fix text's highlight box."

This reverts commit b2d83201fba837ae079d0f608517884def2c43c7.

Revert "Reposition the text's popup when the text is scrolled."

This reverts commit 549dd9160d48572dcbfbae6ae87ae6d8f749aa83.

Revert "Renderer Depth UTCs + test-gl-abstraction update"

This reverts commit d7708e4df9cd7392fd0d2c880f47d8b703b2b8e6.

Revert "Text - Replace the if/else in the ChangeState method by a switch/case."

This reverts commit 12fe9741661d0fefaabddd959d04566a0a2d2233.

Change-Id: I57d0366d424a006dee3d1bd4292e0cc3795801bf
45 files changed:
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h
automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp
automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp
build/tizen/docs/dali.doxy.in
dali-toolkit/dali-toolkit.h
dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp
dali-toolkit/internal/controls/buttons/button-impl.cpp
dali-toolkit/internal/file.list
dali-toolkit/internal/text/decorator/text-decorator.cpp
dali-toolkit/internal/text/decorator/text-decorator.h
dali-toolkit/internal/text/rendering/text-backend-impl.cpp
dali-toolkit/internal/text/text-controller-impl.cpp
dali-toolkit/internal/text/text-controller-impl.h
dali-toolkit/internal/text/text-controller.cpp
dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
dali-toolkit/internal/visuals/border/border-visual.cpp
dali-toolkit/internal/visuals/color/color-visual.cpp
dali-toolkit/internal/visuals/gradient/gradient-visual.cpp
dali-toolkit/internal/visuals/image/batch-image-visual.cpp [deleted file]
dali-toolkit/internal/visuals/image/batch-image-visual.h [deleted file]
dali-toolkit/internal/visuals/image/image-visual.cpp
dali-toolkit/internal/visuals/visual-base-data-impl.cpp
dali-toolkit/internal/visuals/visual-base-impl.cpp
dali-toolkit/internal/visuals/visual-base-impl.h
dali-toolkit/internal/visuals/visual-factory-cache.cpp
dali-toolkit/internal/visuals/visual-factory-cache.h
dali-toolkit/internal/visuals/visual-factory-impl.cpp
dali-toolkit/internal/visuals/visual-string-constants.cpp
dali-toolkit/public-api/controls/control-impl.cpp
dali-toolkit/public-api/controls/control-impl.h
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp
dali-toolkit/public-api/dali-toolkit-version.cpp
dali-toolkit/public-api/visuals/image-visual-properties.h
dali-toolkit/public-api/visuals/visual-properties.h
packaging/dali-toolkit.spec
plugins/dali-script-v8/src/rendering/texture-set-api.h
plugins/dali-script-v8/src/rendering/texture-set-wrapper.cpp
plugins/dali-script-v8/src/utils/v8-utils.cpp