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
..
messages	Merging from server/server-1.25 back to trunk.	2008-12-04 22:36:34 +00:00
build_version.py	svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge	2008-06-02 21:14:31 +00:00
install.py	QAR-1040 maint-viewer-11 + OpenAL combo mergeme	2008-12-02 20:35:40 +00:00
setup-path.py	Simplify dir joining in setup-path	2008-02-14 21:06:59 +00:00
template_verifier.py	QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge -r102882:102883 svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-3-merge	2008-11-19 23:26:29 +00:00
update_version_files.py	QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge -r102882:102883 svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-3-merge	2008-11-19 23:26:29 +00:00