Merge lp://qastaging/~brandontschaefer/nux/nux-SRUs into lp://qastaging/nux/2.0
Proposed by
Brandon Schaefer
| Status: | Merged |
|---|---|
| Approved by: | Tim Penhey |
| Approved revision: | 622 |
| Merged at revision: | 616 |
| Proposed branch: | lp://qastaging/~brandontschaefer/nux/nux-SRUs |
| Merge into: | lp://qastaging/nux/2.0 |
| Diff against target: |
606 lines (+261/-39) 15 files modified
Nux/AnimatedTextureArea.cpp (+2/-2) Nux/Area.cpp (+1/-0) Nux/InputMethodIBus.cpp (+5/-0) Nux/ProgramFramework/TestView.cpp (+7/-0) Nux/ProgramFramework/TestView.h (+4/-0) Nux/ScrollView.cpp (+28/-19) Nux/View.cpp (+7/-2) NuxGraphics/FontTexture.cpp (+7/-7) NuxGraphics/GLTextureResourceManager.cpp (+20/-7) NuxGraphics/GraphicsDisplayX11.cpp (+1/-0) NuxImage/CairoGraphics.cpp (+4/-1) tests/Makefile.am (+1/-0) tests/gtest-nux-scrollview.cpp (+127/-0) tests/gtest-nux-view.cpp (+46/-0) tools/unity_support_test.c (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~brandontschaefer/nux/nux-SRUs |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jay Taoko (community) | Approve | ||
|
Review via email:
|
|||
Commit message
SRUs for Nux 2.0 from Nux 3.0 (618, 619, 621, 622, 623, 624, 631).
Description of the change
Back porting some revisions form trunk Nux:
618
619
621
622
623
624
631
(627-629 could not be back ported, it needs 625 but that breaks the api)
Everything compiles, and test pass.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Compile and works with Unity 5.0 SRU