← Back to branch summary

~unity-team/unity/nux.event-fixes-with-trunk-conflicts

~unity-team/unity/nux.event-fixes-with-trunk-conflicts

Viewing all changes in revision 226.

Committer: Neil Jagdish Patel
Date: 2011-02-23 09:34:03 UTC
mfrom: (220.3.16 nux)
Revision ID: neil.patel@canonical.com-20110223093403-g39b1b65o8g5elit

[merge] trunk, with conflicts, though :(

Show diffs side-by-side

added added

removed removed

Nux/BaseWindow.cpp

Nux/BaseWindow.h

Nux/GridHLayout.cpp

Nux/GridVLayout.cpp

Nux/HLayout.cpp

Nux/InputArea.h

Nux/LayeredLayout.cpp

Nux/PaintLayer.cpp

Nux/PaintLayer.h

Nux/TextEntry.cpp

Nux/VLayout.cpp

Nux/WindowCompositor.cpp

NuxCore/Object.cpp

NuxCore/Object.h

NuxGraphics/Events.cpp

NuxGraphics/Events.h

NuxGraphics/GLVertexResourceManager.cpp

NuxGraphics/GraphicsDisplayX11.cpp

NuxGraphics/XInputWindow.cpp

NuxGraphics/XInputWindow.h

NuxMesh/NTextureArchiveManager.cpp

examples/gridlayout.cpp

examples/layeredlayout.cpp

Older »