phoenix-firestorm

Author	SHA1	Message	Date
Oz Linden	a5619d16f7	correct licenses (fix problem with license change merge)	2010-10-13 07:24:37 -04:00
Mark Palange	0274c1f2b1	Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2. merged all changes, post copy, from the following branches: linden/brachnes/enable-o-v user/cg/qar-1538 user/mani/viewer2-enable-o-v	2009-07-16 17:54:58 +00:00
Aaron Brashears	e3cf284388	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
Aaron Brashears	5595a99623	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
Steven Bennetts	cf40518428	merge -r 58986:59028 maintenance	2007-03-09 22:55:16 +00:00
James Cook	420b91db29	Print done when done.	2007-01-02 08:33:20 +00:00