David Parks 536e38ad51 Merging render-pipeline-6-qa-2 into viewer-2 ... Self reviewed.		2009-09-22 11:11:45 +00:00
..
CMakeLists.txt	Merging render-pipeline-6-qa-2 into viewer-2	2009-09-22 11:11:45 +00:00
llui_libtest.cpp	svn merge -r130238:130240 svn+ssh://svn.lindenlab.com/svn/linden/branches/linux-updater-6	2009-08-21 21:52:21 +00:00
llui_libtest.h	merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3	2009-06-21 08:04:56 +00:00
llwidgetreg.cpp	Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.	2009-07-27 17:56:26 +00:00
llwidgetreg.h	Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:	2009-07-07 00:53:05 +00:00