phoenix-firestorm/indra/llwindow
Steven Bennetts 875606a04d QAR-566 maint-viewer-5-merge-2
Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2
Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release
2008-05-11 20:56:42 +00:00
..
lldxhardware.cpp svn merge -r 83778:83944 maint-ui-10-merge 2008-04-03 18:43:54 +00:00
lldxhardware.h svn merge -r 83778:83944 maint-ui-10-merge 2008-04-03 18:43:54 +00:00
llkeyboard.cpp Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
llkeyboard.h 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
llkeyboardmacosx.cpp svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge 2008-03-04 16:59:57 +00:00
llkeyboardmacosx.h 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
llkeyboardsdl.cpp svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge 2008-03-04 16:59:57 +00:00
llkeyboardsdl.h 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
llkeyboardwin32.cpp svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge 2008-03-04 16:59:57 +00:00
llkeyboardwin32.h 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
llmousehandler.h merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llpreeditor.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llwindow.cpp svn merge -r 85582:85586 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer-5-merge 2008-04-24 18:38:17 +00:00
llwindow.h QAR-460 Automatic XUI selection & Kick-ass Linux Fonts MergeMe 2008-04-17 14:56:00 +00:00
llwindowheadless.cpp 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
llwindowheadless.h svn merge -r 83778:83944 maint-ui-10-merge 2008-04-03 18:43:54 +00:00
llwindowmacosx-objc.h 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
llwindowmacosx-objc.mm QAR-566 maint-viewer-5-merge-2 2008-05-11 20:56:42 +00:00
llwindowmacosx.cpp QAR-460 Automatic XUI selection & Kick-ass Linux Fonts MergeMe 2008-04-17 14:56:00 +00:00
llwindowmacosx.h QAR-460 Automatic XUI selection & Kick-ass Linux Fonts MergeMe 2008-04-17 14:56:00 +00:00
llwindowmesaheadless.cpp 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
llwindowmesaheadless.h svn merge -r 83778:83944 maint-ui-10-merge 2008-04-03 18:43:54 +00:00
llwindowsdl.cpp Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
llwindowsdl.h QAR-460 Automatic XUI selection & Kick-ass Linux Fonts MergeMe 2008-04-17 14:56:00 +00:00
llwindowwin32.cpp merge release-QAR-499 Viewer 1.20 RC 3 2008-04-28 23:29:46 +00:00
llwindowwin32.h QAR-460 Automatic XUI selection & Kick-ass Linux Fonts MergeMe 2008-04-17 14:56:00 +00:00