Merge remote-tracking branch 'lirusato/master'

2013-01-22 20:06:03 +01:00
parent b758014ebc dd1e9a68d4
commit d8c846288e
32 changed files with 311 additions and 553 deletions
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -63,7 +63,6 @@ set(llui_SOURCE_FILES
    llspinctrl.cpp
    llstyle.cpp
    lltabcontainer.cpp
-    lltabcontainervertical.cpp
    lltextbox.cpp
    lltexteditor.cpp
    lltextparser.cpp
@@ -127,7 +126,6 @@ set(llui_HEADER_FILES
    llspinctrl.h
    llstyle.h
    lltabcontainer.h
-    lltabcontainervertical.h
    lltextbox.h
    lltexteditor.h
    lltextparser.h