..
GL
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
2008-06-02 21:14:31 +00:00
CMakeLists.txt
svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
2009-08-27 19:00:18 +00:00
lldxhardware.cpp
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
2009-06-21 08:04:56 +00:00
lldxhardware.h
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
llkeyboard.cpp
Merge a big bunch of fixes from maint-viewer. Hooray.
2009-10-14 10:40:56 +00:00
llkeyboard.h
Merge a big bunch of fixes from maint-viewer. Hooray.
2009-10-14 10:40:56 +00:00
llkeyboardmacosx.cpp
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
2009-06-21 08:04:56 +00:00
llkeyboardmacosx.h
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
llkeyboardsdl.cpp
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
2009-06-21 08:04:56 +00:00
llkeyboardsdl.h
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
llkeyboardwin32.cpp
Merge a big bunch of fixes from maint-viewer. Hooray.
2009-10-14 10:40:56 +00:00
llkeyboardwin32.h
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
llmousehandler.cpp
svn merge -r117314:117337
2009-04-16 23:45:35 +00:00
llmousehandler.h
Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
2009-10-03 23:40:28 +00:00
llpreeditor.h
Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
2009-10-03 23:40:28 +00:00
llwindow.cpp
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
2009-06-21 08:04:56 +00:00
llwindow.h
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
2009-06-21 08:04:56 +00:00
llwindowcallbacks.cpp
Backed out changeset 60da2fc952a0
2009-10-21 11:15:46 -07:00
llwindowcallbacks.h
Backed out changeset 60da2fc952a0
2009-10-21 11:15:46 -07:00
llwindowheadless.cpp
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
2009-06-21 08:04:56 +00:00
llwindowheadless.h
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
2009-06-21 08:04:56 +00:00
llwindowmacosx-objc.h
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
llwindowmacosx-objc.mm
QAR-566 maint-viewer-5-merge-2
2008-05-11 20:56:42 +00:00
llwindowmacosx.cpp
Change to fix DEV-43230 (Japanese input methods don't work with the web browser plugin on the Mac.)
2009-11-20 17:12:46 -08:00
llwindowmacosx.h
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
2009-06-21 08:04:56 +00:00
llwindowmesaheadless.cpp
QAR-1619: For some reason the LLWindowMesaHeadless constructor omitted the
2009-06-23 21:31:09 +00:00
llwindowmesaheadless.h
QAR-1619: For some reason the LLWindowMesaHeadless constructor omitted the
2009-06-23 21:31:09 +00:00
llwindowsdl.cpp
trivial dead code removal.
2009-11-05 13:31:17 +00:00
llwindowsdl.h
Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.
2009-07-16 17:54:58 +00:00
llwindowwin32.cpp
Backed out changeset 60da2fc952a0
2009-10-21 11:15:46 -07:00
llwindowwin32.h
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
2009-06-21 08:04:56 +00:00