James Cook 8f7ec64899 Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete. ... Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry		2009-07-27 17:56:26 +00:00
..
CMakeLists.txt	merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3	2009-06-21 08:04:56 +00:00
llcontrol.cpp	merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3	2009-06-21 17:16:27 +00:00
llcontrol.h	Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.	2009-07-16 17:54:58 +00:00
llcontrolgroupreader.h	merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3	2009-06-21 08:04:56 +00:00
llxmlnode.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
llxmlnode.h	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
llxmlparser.cpp	Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165	2009-01-08 00:05:06 +00:00
llxmlparser.h	Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165	2009-01-08 00:05:06 +00:00
llxmltree.cpp	Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165	2009-01-08 00:05:06 +00:00
llxmltree.h	Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165	2009-01-08 00:05:06 +00:00