Melinda Green e1d8dac25a svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge ... Resolving QAR-1051 Merge featurettes batch #4		2008-12-15 21:21:19 +00:00
..
CMakeLists.txt	svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge	2008-12-15 21:21:19 +00:00
bitpack.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
ctype_workaround.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
doublelinkedlist.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
imageids.h	merge release@83343 skinning-1-merge@83714 -> release	2008-04-01 17:45:04 +00:00
indra_constants.h	Merging from server/server-1.25 back to trunk.	2008-12-04 22:36:34 +00:00
linden_common.h	Fix for VC7 DEBUG build failure	2008-09-15 19:45:18 +00:00
linked_lists.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llagentconstants.h	svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release	2008-04-03 22:50:22 +00:00
llapp.cpp	Merging from server/server-1.25 back to trunk.	2008-12-04 22:36:34 +00:00
llapp.h	Merging from server/server-1.25 back to trunk.	2008-12-04 22:36:34 +00:00
llapr.cpp	QAR-855 Viewer 1.21 RC 2	2008-09-12 06:27:13 +00:00
llapr.h	QAR-855 Viewer 1.21 RC 2	2008-09-12 06:27:13 +00:00
llassettype.cpp	svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated	2008-07-31 12:15:15 +00:00
llassettype.h	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	2008-06-26 00:39:00 +00:00
llassoclist.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llavatarconstants.h	merge of age verification changes from QAR-76 to release; changes were originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112.	2007-11-15 19:10:29 +00:00
llbase32.cpp	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llbase32.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llbase64.cpp	svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge	2008-06-02 21:14:31 +00:00
llbase64.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llboost.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llchat.h	svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge	2008-12-15 21:21:19 +00:00
llclickaction.h	svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release	2008-02-14 01:45:59 +00:00
llcommon.cpp	svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841	2008-09-05 22:03:35 +00:00
llcommon.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llcrc.cpp	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	2008-06-26 00:39:00 +00:00
llcrc.h	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	2008-06-26 00:39:00 +00:00
llcriticaldamp.cpp	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llcriticaldamp.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llcursortypes.cpp	svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge	2008-12-15 21:21:19 +00:00
llcursortypes.h	svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge	2008-12-15 21:21:19 +00:00
lldarray.h	svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge	2008-06-02 21:14:31 +00:00
lldarrayptr.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
lldate.cpp	svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge	2008-06-02 21:14:31 +00:00
lldate.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
lldefs.h	svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release	2008-04-03 22:50:22 +00:00
lldepthstack.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
lldlinked.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
lldqueueptr.h	QAR-855 Viewer 1.21 RC 2	2008-09-12 06:27:13 +00:00
llendianswizzle.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llenum.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llerror.cpp	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	2008-06-26 00:39:00 +00:00
llerror.h	Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .	2008-05-14 21:37:13 +00:00
llerrorcontrol.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llerrorlegacy.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llerrorthread.cpp	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llerrorthread.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llevent.cpp	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	2008-06-26 00:39:00 +00:00
llevent.h	merge release@82383 viewer-cleanup2-7-merge@82828	2008-03-20 21:41:26 +00:00
lleventemitter.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llextendedstatus.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llfasttimer.h	QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release	2008-11-07 17:51:03 +00:00
llfile.cpp	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	2008-06-26 00:39:00 +00:00
llfile.h	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	2008-06-26 00:39:00 +00:00
llfindlocale.cpp	Fix gcc4 with proper Linden-canonical struct definitions	2008-08-25 15:24:10 +00:00
llfindlocale.h	Fix gcc4 with proper Linden-canonical struct definitions	2008-08-25 15:24:10 +00:00
llfixedbuffer.cpp	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	2008-06-26 00:39:00 +00:00
llfixedbuffer.h	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	2008-06-26 00:39:00 +00:00
llformat.cpp	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llformat.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llframetimer.cpp	svn merge -r 88872:89137 svn+ssh://svn.lindenlab.com/svn/linden/qa/qar-652 --> release	2008-06-06 22:52:02 +00:00
llframetimer.h	svn merge -r 88872:89137 svn+ssh://svn.lindenlab.com/svn/linden/qa/qar-652 --> release	2008-06-06 22:52:02 +00:00
llhash.h	svn merge -r103586:104391 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-4-sandbox-r103546	2008-12-01 16:34:31 +00:00
llheartbeat.cpp	svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge	2008-06-02 21:14:31 +00:00
llheartbeat.h	QAR-455 Launcher and Heartbeat fixes MergeMe	2008-04-16 09:29:07 +00:00
llhttpstatuscodes.h	merge -r94900 linden/branches/kelly/qar-825 to linden/release	2008-08-26 17:15:20 +00:00
llindexedqueue.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llkeythrottle.h	svn merge -r95195:96886 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release	2008-09-17 10:21:38 +00:00
llkeyusetracker.h	QAR-404 - merge - svn merge -r 85795:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/metrics/metrics-4-release release	2008-04-25 17:35:42 +00:00
lllinkedqueue.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llliveappconfig.cpp	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	2008-06-26 00:39:00 +00:00
llliveappconfig.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
lllivefile.cpp	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	2008-06-26 00:39:00 +00:00
lllivefile.h	svn merge -r84080:84255 svn+ssh://svn/svn/linden/branches/intermezzo-9	2008-04-08 21:04:41 +00:00
lllocalidhashmap.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
lllog.cpp	svn merge -r 78173:78397 search-milestone2-1 for classified click-through logging for Streambase so data warehousing can figure out ROI/purchase history immediately after a teleport from an ad. DEV-9204	2008-01-24 23:26:05 +00:00
lllog.h	EFFECTIVE MERGE: svn -r 74436:74675 svn+ssh://svn/svn/linden/branches/log-streambase-1	2007-12-06 23:43:36 +00:00
lllslconstants.h	QAR-782 Merge featurettes batch #2	2008-08-13 19:37:05 +00:00
llmap.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llmd5.cpp	svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge	2008-06-02 21:14:31 +00:00
llmd5.h	svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge	2008-06-02 21:14:31 +00:00
llmemory.cpp	QAR-767 Combined maint-render-7 and maint-viewer-9 merge	2008-08-12 17:29:50 +00:00
llmemory.h	merge release@83343 skinning-1-merge@83714 -> release	2008-04-01 17:45:04 +00:00
llmemorystream.cpp	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llmemorystream.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llmemtype.h	QAR-767 Combined maint-render-7 and maint-viewer-9 merge	2008-08-12 17:29:50 +00:00
llmetrics.cpp	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llmetrics.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llmortician.cpp	svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134	2007-12-19 00:56:59 +00:00
llmortician.h	svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134	2007-12-19 00:56:59 +00:00
llnametable.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llpreprocessor.h	svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge	2008-06-02 21:14:31 +00:00
llpriqueuemap.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llprocessor.cpp	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	2008-06-26 00:39:00 +00:00
llprocessor.h	Fix gcc4 with proper Linden-canonical struct definitions	2008-08-25 15:24:10 +00:00
llptrskiplist.h	svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge	2008-06-02 21:14:31 +00:00
llptrskipmap.h	QAR-566 maint-viewer-5-merge-2	2008-05-11 20:56:42 +00:00
llqueuedthread.cpp	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llqueuedthread.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llrand.cpp	svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge	2008-06-02 21:14:31 +00:00
llrand.h	svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge	2008-06-02 21:14:31 +00:00
llrun.cpp	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llrun.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llsd.cpp	svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge	2008-06-02 21:14:31 +00:00
llsd.h	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	2008-06-26 00:39:00 +00:00
llsdserialize.cpp	svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841	2008-09-05 22:03:35 +00:00
llsdserialize.h	svn merge -r90394:90492 svn/branches/havok4/qar-689 --> release	2008-06-25 16:22:00 +00:00
llsdserialize_xml.cpp	svn merge -r103586:104391 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-4-sandbox-r103546	2008-12-01 16:34:31 +00:00
llsdserialize_xml.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llsdutil.cpp	svn merge -r 90938:92097 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge -> release. This is for QAR-730: Combination merge of QAR-432 and QAR-601	2008-07-15 00:41:08 +00:00
llsdutil.h	svn merge -r 90938:92097 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge -> release. This is for QAR-730: Combination merge of QAR-432 and QAR-601	2008-07-15 00:41:08 +00:00
llsecondlifeurls.cpp	merge viewer/viewer_1-21 94170-94770 -> release	2008-08-28 23:57:41 +00:00
llsecondlifeurls.h	merge viewer/viewer_1-21 94170-94770 -> release	2008-08-28 23:57:41 +00:00
llsimplehash.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llskiplist.h	svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release	2008-04-03 22:50:22 +00:00
llskipmap.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llsmoothstep.h	svn merge -r 82272:82277 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-9-merge-2 --> release	2008-03-14 19:27:38 +00:00
llstack.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llstat.cpp	QAR-907: svn merge -r 98908:98910 svn+ssh://svn/svn/linden/qa/sim-metrics/sim-metrics2-release-merge-98903 into release	2008-10-09 18:07:46 +00:00
llstat.h	QAR-907: svn merge -r 98908:98910 svn+ssh://svn/svn/linden/qa/sim-metrics/sim-metrics2-release-merge-98903 into release	2008-10-09 18:07:46 +00:00
llstatenums.h	QAR-907: svn merge -r 98908:98910 svn+ssh://svn/svn/linden/qa/sim-metrics/sim-metrics2-release-merge-98903 into release	2008-10-09 18:07:46 +00:00
llstl.h	svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841	2008-09-05 22:03:35 +00:00
llstreamtools.cpp	QAR-377 maintenance-6 merge:	2008-03-19 00:01:42 +00:00
llstreamtools.h	QAR-377 maintenance-6 merge:	2008-03-19 00:01:42 +00:00
llstrider.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llstring.cpp	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	2008-06-26 00:39:00 +00:00
llstring.h	svn merge -r99056:99248 svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew/gcc-4-003-for-merge	2008-10-10 16:04:02 +00:00
llstringtable.cpp	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llstringtable.h	svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release	2007-11-01 22:02:35 +00:00
llsys.cpp	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	2008-06-26 00:39:00 +00:00
llsys.h	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	2008-06-26 00:39:00 +00:00
llthread.cpp	QAR-855 Viewer 1.21 RC 2	2008-09-12 06:27:13 +00:00
llthread.h	svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841	2008-09-05 22:03:35 +00:00
lltimer.cpp	QAR-907: svn merge -r 98908:98910 svn+ssh://svn/svn/linden/qa/sim-metrics/sim-metrics2-release-merge-98903 into release	2008-10-09 18:07:46 +00:00
lltimer.h	QAR-907: svn merge -r 98908:98910 svn+ssh://svn/svn/linden/qa/sim-metrics/sim-metrics2-release-merge-98903 into release	2008-10-09 18:07:46 +00:00
lluri.cpp	svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge	2008-06-02 21:14:31 +00:00
lluri.h	svn merge -r 76642:76643 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-4-merge-76640	2007-12-29 01:40:57 +00:00
lluuid.cpp	svn merge -r 90938:92097 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge -> release. This is for QAR-730: Combination merge of QAR-432 and QAR-601	2008-07-15 00:41:08 +00:00
lluuid.h	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	2008-06-26 00:39:00 +00:00
lluuidhashmap.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
llversionserver.h	Merging from server/server-1.25 back to trunk.	2008-12-04 22:36:34 +00:00
llversionviewer.h	QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release	2008-11-07 17:51:03 +00:00
llworkerthread.cpp	QAR-669 1.20 Viewer RC11	2008-06-27 21:02:01 +00:00
llworkerthread.h	QAR-669 1.20 Viewer RC11	2008-06-27 21:02:01 +00:00
metaclass.cpp	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
metaclass.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
metaclasst.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
metaproperty.cpp	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
metaproperty.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
metapropertyt.h	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	2008-06-26 00:39:00 +00:00
reflective.cpp	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
reflective.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
reflectivet.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
roles_constants.h	svn merge -r 90938:92097 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge -> release. This is for QAR-730: Combination merge of QAR-432 and QAR-601	2008-07-15 00:41:08 +00:00
stdenums.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
stdtypes.h	svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge	2008-06-02 21:14:31 +00:00
string_table.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
timer.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
timing.cpp	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
timing.h	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
u64.cpp	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	2008-06-26 00:39:00 +00:00
u64.h	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	2008-06-26 00:39:00 +00:00