merge fix

This commit is contained in:
Andre Antunes
2011-04-09 22:28:51 -03:00
46 changed files with 1147 additions and 245 deletions

View File

@@ -78,13 +78,19 @@ SET(SOURCES
src/framework/util.cpp
# ui
src/framework/ui/anchorlayout.cpp
src/framework/ui/uielement.cpp
src/framework/ui/uielementskin.cpp
src/framework/ui/uibuttonskin.cpp
src/framework/ui/uicontainer.cpp
src/framework/ui/uiskins.cpp
src/framework/ui/uipanel.cpp
src/framework/ui/uibutton.cpp
src/framework/ui/uilabel.cpp
src/framework/ui/uiwindow.cpp
src/framework/ui/uiwindowskin.cpp
src/framework/ui/uitextedit.cpp
src/framework/ui/uitexteditskin.cpp
# network
src/framework/net/connection.cpp