Merov Linden db803e193e Merge conflict mixup, use noaction instead of none for user preference		2013-06-19 13:51:12 -07:00
..
cmake	fix local build numbers when compiling a merge before committing (two parents)	2013-06-04 12:33:51 -04:00
copy_win_scripts	…
integration_tests	…
lib/python	remove files incorrectly brought back from the past by merges	2013-06-18 12:31:54 -04:00
linux_crash_logger	…
linux_updater	…
llappearance	Cleanup rollback and try point MIPs experiment to see if that's what is hosing the Mac on 10.6.8	2013-06-12 12:19:48 -07:00
llaudio	Unwind cruft from hunting for 2707 they won't end up in vwr-dev-mat	2013-06-05 14:26:27 -07:00
llcharacter	…
llcommon	remove files incorrectly brought back from the past by merges	2013-06-18 12:31:54 -04:00
llcorehttp	merge up to latest viewer-development for merge to 3.5.2	2013-04-19 14:42:56 -04:00
llcrashlogger	…
llimage	…
llimagej2coj	…
llinventory	…
llkdu	…
llmath	Disable asserts in CalculateTangentArray (discussed with davep) to avoid debugging interruptions from bad assets	2013-06-14 09:32:23 -07:00
llmessage	Unwind cruft from hunting for 2707 they won't end up in vwr-dev-mat	2013-06-05 14:26:27 -07:00
llplugin	merge changes for DRTVWR-294	2013-04-19 10:11:29 -04:00
llprimitive	NORSPEC-233 fix default value and material apply logic errors	2013-06-08 06:28:48 -07:00
llrender	NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent calculator instead of binormal calculator, convert binormal centric code to tangent centric)	2013-06-03 12:50:48 -05:00
llui	Pull merge lindenlab/viewer-release	2013-06-19 12:24:44 -07:00
llvfs	BUG-2707 add some logging to help narrow down what part of login instance handling is going awry	2013-05-30 17:01:28 -07:00
llwindow	Pull merge lindenlab/viewer-release	2013-06-19 12:24:44 -07:00
llxml	…
lscript	merge latest integration repo changes	2013-05-11 11:30:20 -04:00
mac_crash_logger	…
media_plugins	Unwind cruft from hunting for 2707 they won't end up in vwr-dev-mat	2013-06-05 14:26:27 -07:00
newview	Merge conflict mixup, use noaction instead of none for user preference	2013-06-19 13:51:12 -07:00
test	…
test_apps/llplugintest	…
tools/vstool	…
viewer_components	BOOG2707 uncomment cleared suspects	2013-06-05 06:14:27 -07:00
win_crash_logger	…
win_updater	…
CMakeLists.txt	…
edit-me-to-trigger-new-build.txt	…
fix-incredibuild.py	…