..
CMakeLists.txt
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
2008-06-02 21:14:31 +00:00
camera.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
coordframe.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
llbboxlocal.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
llbboxlocal.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
llcamera.cpp
Merge of windlight into release (QAR-286). This includes all changes in
2008-02-27 18:58:14 +00:00
llcamera.h
EFFECTIVE MERGES:
2008-05-19 17:02:33 +00:00
llcoord.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
llcoordframe.cpp
Merge of windlight into release (QAR-286). This includes all changes in
2008-02-27 18:58:14 +00:00
llcoordframe.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
llinterp.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
llline.cpp
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
2008-06-26 00:39:00 +00:00
llline.h
svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
2008-04-03 22:50:22 +00:00
llmath.h
merge support-featurettes-snapshot-merge-2 for QAR-754, includes:
2008-07-18 17:50:25 +00:00
lloctree.h
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
2008-06-02 21:14:31 +00:00
llperlin.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
llperlin.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
llplane.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
llquantize.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
llquaternion.cpp
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
2008-06-26 00:39:00 +00:00
llquaternion.h
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
2008-06-26 00:39:00 +00:00
llrect.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
llrect.h
svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge
2008-07-23 21:20:19 +00:00
llsdutil_math.cpp
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
2008-06-02 21:14:31 +00:00
llsphere.cpp
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
2008-06-26 00:39:00 +00:00
llsphere.h
svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
2008-04-03 22:50:22 +00:00
lltreenode.h
Merge of windlight into release (QAR-286). This includes all changes in
2008-02-27 18:58:14 +00:00
llv4math.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
llv4matrix3.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
llv4matrix4.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
llv4vector3.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
llvolume.cpp
merge viewer/viewer_1-21 94170-94770 -> release
2008-08-28 23:57:41 +00:00
llvolume.h
QAR-782 Merge featurettes batch #2
2008-08-13 19:37:05 +00:00
llvolumemgr.cpp
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
2008-06-26 00:39:00 +00:00
llvolumemgr.h
svn merge -r 88991:89027 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-2-Server --> release
2008-06-07 00:47:05 +00:00
m3math.cpp
svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
2008-04-03 22:50:22 +00:00
m3math.h
svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
2008-04-03 22:50:22 +00:00
m4math.cpp
svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
2008-04-03 22:50:22 +00:00
m4math.h
QAR-566 maint-viewer-5-merge-2
2008-05-11 20:56:42 +00:00
raytrace.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
raytrace.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
v2math.cpp
svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge
2008-07-23 21:20:19 +00:00
v2math.h
svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge
2008-07-23 21:20:19 +00:00
v3color.cpp
Merge of windlight into release (QAR-286). This includes all changes in
2008-02-27 18:58:14 +00:00
v3color.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
v3dmath.cpp
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
2008-06-26 00:39:00 +00:00
v3dmath.h
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
2008-06-26 00:39:00 +00:00
v3math.cpp
svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge
2008-07-23 21:20:19 +00:00
v3math.h
svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge
2008-07-23 21:20:19 +00:00
v4color.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
v4color.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
v4coloru.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
v4coloru.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
v4math.cpp
svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
2008-04-03 22:50:22 +00:00
v4math.h
svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
2008-04-03 22:50:22 +00:00
xform.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
xform.h
svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
2008-04-03 22:50:22 +00:00