|
(cherry picked from commit 7915cde127eba2a5143fd45c6b32e81ad91bdfae)
Conflicts:
framework/Data/Common/Mssql/TMssqlMetaData.php
framework/Data/Common/Mysql/TMysqlMetaData.php
framework/Data/Common/Oracle/TOracleMetaData.php
framework/Data/Common/Pgsql/TPgsqlMetaData.php
framework/Data/Common/Sqlite/TSqliteMetaData.php
framework/Data/Common/TDbMetaData.php
framework/Web/UI/ActiveControls/TCallbackClientScript.php
framework/Web/UI/JuiControls/TJuiAutoComplete.php
framework/Web/UI/JuiControls/TJuiControlAdapter.php
framework/Web/UI/JuiControls/TJuiDraggable.php
framework/Web/UI/JuiControls/TJuiDroppable.php
framework/Web/UI/JuiControls/TJuiResizable.php
framework/Web/UI/JuiControls/TJuiSelectable.php
framework/Web/UI/JuiControls/TJuiSortable.php
framework/Wsat/TWsatARGenerator.php
framework/Wsat/TWsatService.php
framework/Wsat/pages/TWsatGenerateAR.php
framework/Wsat/pages/TWsatHome.php
framework/Wsat/pages/TWsatLogin.php
framework/Wsat/pages/TWsatScaffolding.php
|
