Nat Goodspeed 68f42e4e10 MAINT-5351: Finish cleaning up messy merge from backing out backout		2015-07-10 19:44:47 -04:00
..
cmake	MAINT-2577 Fixed the status message	2015-06-12 11:37:17 +03:00
copy_win_scripts	…
integration_tests	…
lib/python	…
linux_crash_logger	Coding policy fixes	2015-06-17 13:53:28 -07:00
llappearance	merge	2015-04-24 08:55:20 -04:00
llaudio	…
llcharacter	merge changes for 3.7.27-release	2015-04-13 16:23:36 -04:00
llcommon	MAINT-5351: Finish cleaning up messy merge from backing out backout	2015-07-10 19:44:47 -04:00
llcorehttp	Automated merge with file:///Users/nat/linden/maint-4952-v-t-u	2015-07-10 19:37:19 -04:00
llcrashlogger	Change HttpOptions::ptr_t to be shared_ptr<> rather than intrusive.	2015-07-08 12:09:36 -07:00
llimage	merge changes for 3.7.27-release	2015-04-13 16:23:36 -04:00
llimagej2coj	…
llinventory	restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes	2015-04-10 11:02:37 -04:00
llkdu	…
llmath	merge changes for 3.7.27-release	2015-04-13 16:23:36 -04:00
llmessage	Merge restore of more selfless changes	2015-07-10 19:34:20 -04:00
llplugin	…
llprimitive	merge changes for 3.7.29-release	2015-06-08 16:33:02 -04:00
llrender	merge changes for 3.7.27-release	2015-04-13 16:23:36 -04:00
llui	merge changes for 3.7.29-release	2015-06-08 16:33:02 -04:00
llvfs	restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes	2015-04-10 11:02:37 -04:00
llwindow	merge changes for 3.7.27-release	2015-04-13 16:23:36 -04:00
llxml	This was not supposed to get checked in.	2015-04-29 09:33:00 -07:00
lscript	merge changes for 3.7.29-release	2015-06-08 16:33:02 -04:00
mac_crash_logger	Coding policy fixes	2015-06-17 13:53:28 -07:00
media_plugins	…
newview	Automated merge with file:///Users/nat/linden/maint-4952-v-t-u	2015-07-10 19:37:19 -04:00
test	restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes	2015-04-10 11:02:37 -04:00
test_apps	…
tools/vstool	merge changes for 3.7.29-release	2015-06-08 16:33:02 -04:00
viewer_components	Merge restore of more selfless changes	2015-07-10 19:34:20 -04:00
win_crash_logger	Coding policy fixes	2015-06-17 13:53:28 -07:00
CMakeLists.txt	…
edit-me-to-trigger-new-build.txt	…
fix-incredibuild.py	…