Oz Linden f6bcf6dd39 merge changes for vwr-29543		2013-09-11 12:47:25 -04:00
..
cmake	merge changes for 3.6.5-release	2013-09-09 14:51:34 -04:00
copy_win_scripts	…
integration_tests	…
lib/python	CHOP-955: Include app_settings/settings_install.xml in file_list.	2013-07-26 10:42:13 -04:00
linux_crash_logger	…
linux_updater	…
llappearance	…
llaudio	…
llcharacter	…
llcommon	remove llversionviewer.h (incorrectly re-created in a merge)	2013-09-10 14:35:53 -04:00
llcorehttp	…
llcrashlogger	…
llimage	…
llimagej2coj	…
llinventory	…
llkdu	…
llmath	OPEN-149: fix documentation of LLColor4 constructor for F32 vector	2013-09-04 16:37:33 -04:00
llmessage	merge changes for 3.6.3-release	2013-08-20 10:37:10 -04:00
llplugin	Merged in viewer-release	2013-07-11 17:49:13 -07:00
llprimitive	…
llrender	merge changes for 3.6.3-release	2013-08-19 15:51:40 -04:00
llui	MAINT-3074: Remove warning log that kills FPS	2013-08-27 16:31:36 -04:00
llvfs	Automated merge with ssh://bitbucket.org/lindenlab/viewer-release	2013-08-05 19:44:12 -04:00
llwindow	merge changes for 3.6.5-release	2013-09-09 14:51:34 -04:00
llxml	add "Settings" logging tag to make debugging settings loading easier	2013-08-29 09:27:12 -04:00
lscript	…
mac_crash_logger	…
mac_updater	…
media_plugins	…
newview	merge changes for vwr-29543	2013-09-11 12:47:25 -04:00
test	Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material instead of mMaterial	2013-05-11 20:38:23 -07:00
test_apps/llplugintest	…
tools/vstool	…
viewer_components	merge changes for 3.6.5-release	2013-09-09 14:51:34 -04:00
win_crash_logger	…
win_updater	…
CMakeLists.txt	…
edit-me-to-trigger-new-build.txt	Adding a non-code change to force a rebuild of the CHUI RC to avoid CHOP-100	2013-07-30 15:17:02 +00:00
fix-incredibuild.py	…