lp://staging/~thumper/nux/nux.armel-fixes

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/nux at revision 713

Brandon Schaefer (community): Approve on 2012-11-21

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2012-11-21

Jay Taoko (community): Approve on 2012-11-12

Nicolas d'Offay (community): Needs Fixing on 2012-10-30

Diff: 3586 lines (+805/-622)

53 files modified

INSTALL (+7/-2)
Nux/Area.cpp (+29/-16)
Nux/Area.h (+3/-2)
Nux/BaseWindow.cpp (+29/-6)
Nux/BaseWindow.h (+4/-6)
Nux/FloatingWindow.cpp (+3/-4)
Nux/GesturesSubscription.cpp (+4/-0)
Nux/InputArea.cpp (+30/-17)
Nux/InputMethodIBus.cpp (+0/-4)
Nux/MainLoopGLib.cpp (+26/-17)
Nux/Makefile.am (+100/-84)
Nux/MenuPage.h (+0/-1)
Nux/Nux.cpp (+1/-0)
Nux/Nux.h (+4/-1)
Nux/TextEntry.cpp (+18/-15)
Nux/TextEntry.h (+2/-2)
Nux/WindowCompositor.cpp (+34/-16)
Nux/WindowCompositor.h (+7/-0)
Nux/WindowThread.cpp (+16/-7)
Nux/WindowThread.h (+18/-6)
NuxCore/Logger.cpp (+6/-1)
NuxCore/System.h (+27/-4)
NuxGraphics/CairoGraphics.h (+4/-0)
NuxGraphics/Events.cpp (+6/-7)
NuxGraphics/Events.h (+4/-4)
NuxGraphics/FontRenderer.cpp (+6/-0)
NuxGraphics/FontRenderer.h (+2/-3)
NuxGraphics/GLDeviceObjects.h (+2/-0)
NuxGraphics/GLRenderStates.cpp (+8/-17)
NuxGraphics/GLRenderStates.h (+27/-157)
NuxGraphics/GLResource.h (+7/-5)
NuxGraphics/GLSh_ColorPicker.cpp (+12/-1)
NuxGraphics/GLSh_ColorPicker.h (+2/-0)
NuxGraphics/GLSh_DrawFunction.cpp (+2/-0)
NuxGraphics/GLSh_DrawFunction.h (+2/-0)
NuxGraphics/GLWindowManager.cpp (+5/-5)
NuxGraphics/GLWindowManager.h (+6/-4)
NuxGraphics/GpuDevice.cpp (+36/-7)
NuxGraphics/GpuDevice.h (+12/-1)
NuxGraphics/GpuDeviceShader.cpp (+2/-0)
NuxGraphics/GraphicsDisplay.h (+1/-1)
NuxGraphics/GraphicsDisplayX11.cpp (+4/-1)
NuxGraphics/GraphicsEngine.cpp (+13/-11)
NuxGraphics/GraphicsEngine.h (+2/-1)
NuxGraphics/IOpenGLSurface.cpp (+5/-4)
NuxGraphics/Makefile.am (+26/-8)
NuxGraphics/RenderingPipeGLSL.cpp (+133/-137)
NuxGraphics/VirtualKeyCodes.h (+5/-0)
configure.ac (+37/-7)
gputests/framebufferobject.cpp (+19/-9)
gputests/quad_2texmod.cpp (+1/-0)
gputests/texture_blur.cpp (+42/-19)
gputests/texture_copy_blur.cpp (+4/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

714. By Tim Penhey on 2012-11-20

Don't compile WaitForNotify if we don't need it, and hence shut up the warning come error.

713. By Tim Penhey on 2012-11-20

Merge lp:nux and resolve conflicts.

712. By Tim Penhey on 2012-11-14

Clear the C struct prior to attempting to set a value.

711. By Tim Penhey on 2012-11-12

Merge trunk

710. By Tim Penhey on 2012-10-29

Merge trunk.

709. By Tim Penhey on 2012-10-19

Rendering pipe is for non-gles

708. By Tim Penhey on 2012-10-19

Bring over keycode changes.

707. By Tim Penhey on 2012-10-19

Oops, put the exclusion in the wrong place.

706. By Tim Penhey on 2012-10-19

Comment out whole method.

705. By Tim Penhey on 2012-10-19

No timelines in a minimal build.