| .. |
|
tests
|
svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
|
2009-10-01 02:35:53 +00:00 |
|
CMakeLists.txt
|
svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
|
2009-10-01 02:35:53 +00:00 |
|
legacy_object_types.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 |
|
llmaterialtable.cpp
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
llmaterialtable.h
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
llmediaentry.cpp
|
svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
|
2009-10-01 02:35:53 +00:00 |
|
llmediaentry.h
|
svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
|
2009-10-01 02:35:53 +00:00 |
|
llprimitive.cpp
|
svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
|
2009-10-01 02:35:53 +00:00 |
|
llprimitive.h
|
Merging render-pipeline-6-qa-2 into viewer-2
|
2009-09-22 11:11:45 +00:00 |
|
llprimlinkinfo.h
|
svn merge -r108815:112761 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
|
2009-02-25 21:02:17 +00:00 |
|
llprimtexturelist.cpp
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
llprimtexturelist.h
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
lltextureanim.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 |
|
lltextureanim.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 |
|
lltextureentry.cpp
|
svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
|
2009-10-01 02:35:53 +00:00 |
|
lltextureentry.h
|
svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
|
2009-10-01 02:35:53 +00:00 |
|
lltree_common.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 |
|
lltreeparams.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 |
|
lltreeparams.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 |
|
llvolumemessage.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 |
|
llvolumemessage.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 |
|
llvolumexml.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 |
|
llvolumexml.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 |
|
material_codes.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 |
|
object_flags.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 |
cf9239cabc