3 Commits (d992d38fba5ed2a79f90583bd5d15a26f00a99ee)

Author	SHA1	Message	Date
Adam Moss	158946668a	svn merge -r130875:131962 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit ... DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit	2009-08-31 17:16:21 +00:00
Monroe Williams	558897b4b9	svn merge -r 132139:132140 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-5 ... In the webkit plugin, don't try to load web browser plugins except on Windows. The flash plugin on the Mac crashes the webkit plugin when running under xcode.	2009-08-29 01:08:36 +00:00
Monroe Williams	745845f799	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 ... svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.	2009-08-27 19:00:18 +00:00