5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
e3f1d1b981
First round of URL updates for the new firestormviewer.org domain
2013-01-04 21:59:45 +01:00
15c8a8cc0a
Branding updaters & Crashloggers. These aren't used, but better to do it now.
2010-11-21 12:05:51 -05:00
5e0d27b1c3
port of 'SNOW-592 FIXED gstreamer 0.10.28 standalone build failure'
2010-09-25 11:02:02 +01:00
c7a57bdf87
Update gstreamer video plugin's license in accordance with... our new license.
2010-09-25 10:52:45 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
52c8ffaa49
Some tidy-ups to the gstreamer media plugin while I try to figure out where the black-frame-on-resize is coming from.
2009-12-24 16:53:54 -08:00
4102367297
minor improvements to gstreamer media plugin's logging.
2009-12-18 13:21:43 -08:00
8e3276ebf9
doxygen: exclude licensing comments
2009-11-30 14:53:31 -08:00
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
Ansariel