Graham Madarasz
|
a099815774
|
Merge vwr-dev-mat
|
2013-05-11 08:11:13 -07:00 |
|
Graham Madarasz
|
f2455ccaaf
|
Put back normal map and spec map initializers/destruction, delete FMOD refs (unneeded with FMODEX), make indra.l/y safe for bison >= 2.7
|
2013-05-10 16:10:25 -07:00 |
|
Graham Madarasz
|
806d09b114
|
Merge 3.5.1 into Materials
|
2013-04-30 19:50:05 -07:00 |
|
Graham Madarasz
|
3834cb6f8a
|
Fix linux breakage from sunshine merge
|
2013-04-26 09:02:31 -07:00 |
|
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
Kelly Washington
|
aa2b978bf5
|
merge -r 112783:112799 linden/branches/kelly/lsl-http-in-merge to linden/trunk
|
2009-02-24 19:29:36 +00:00 |
|
Steven Bennetts
|
da94c0eaa2
|
QAR-855 Viewer 1.21 RC 2
merge viewer_1-21 94770-96059 -> release
|
2008-09-12 06:27:13 +00:00 |
|
Aaron Brashears
|
4942a7b779
|
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
|
2007-10-04 16:31:48 +00:00 |
|
Christian Goetze
|
ce0a5fe145
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
|
2007-08-21 22:17:53 +00:00 |
|
Bryan O'Sullivan
|
ce7682c2a4
|
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
(only inside indra)
(josh) Original log message was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
|
2007-07-18 21:22:40 +00:00 |
|
Kelly Washington
|
e03bb0606a
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
James Cook
|
420b91db29
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |