livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
605 Commits
2 Branches
0 Tags
297 MiB
C++ 86.3%
R 8.1%
GLSL 1.7%
HTML 1.1%
Python 0.8%
Other 1.9%
 
 
 
 
 
 
Go to file
Robert Knop 189599b6ff Merging from server/server-1.25 back to trunk. 
svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25

Conflicts resolved by Prospero, except for one scary conflict in
SendConfirmationEmail.php which was resolved by jarv.
 		2008-12-04 22:36:34 +00:00
doc QAR-1040 maint-viewer-11 + OpenAL combo mergeme 2008-12-02 20:35:40 +00:00
etc svn merge -r96886:98039 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release 2008-10-01 00:42:47 +00:00
indra Merging from server/server-1.25 back to trunk. 2008-12-04 22:36:34 +00:00
scripts Merging from server/server-1.25 back to trunk. 2008-12-04 22:36:34 +00:00
install.xml Merging from server/server-1.25 back to trunk. 2008-12-04 22:36:34 +00:00