phoenix-firestorm/indra
Nyx Linden 438ceeb008 BUILDFIX: merge cleanup
A couple of merge issues that caused the resulting code to not build.
2013-01-25 17:58:11 -05:00
..
cmake merging in viewer-beta. 2013-01-24 16:22:49 -05:00
copy_win_scripts
integration_tests SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance. 2012-11-28 16:36:34 -05:00
lib/python
linux_crash_logger
linux_updater SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance. 2012-11-28 16:36:34 -05:00
llappearance BUILDFIX: merge cleanup 2013-01-25 17:58:11 -05:00
llaudio
llcharacter merging in viewer-beta. 2013-01-24 16:22:49 -05:00
llcommon BUILDFIX: merge cleanup 2013-01-25 17:58:11 -05:00
llcorehttp merge changes for DRTVWR-260 2012-12-10 15:33:39 -05:00
llcrashlogger merging in viewer-beta. 2013-01-24 16:22:49 -05:00
llimage merging in viewer-beta. 2013-01-24 16:22:49 -05:00
llimagej2coj
llinventory merging in viewer-beta. 2013-01-24 16:22:49 -05:00
llkdu merging in viewer-beta. 2013-01-24 16:22:49 -05:00
llmath merging in viewer-beta. 2013-01-24 16:22:49 -05:00
llmessage merging in viewer-beta. 2013-01-24 16:22:49 -05:00
llplugin merging in viewer-beta. 2013-01-24 16:22:49 -05:00
llprimitive merging in viewer-beta. 2013-01-24 16:22:49 -05:00
llrender merging in viewer-beta. 2013-01-24 16:22:49 -05:00
llui merging in viewer-beta. 2013-01-24 16:22:49 -05:00
llvfs merging in viewer-beta. 2013-01-24 16:22:49 -05:00
llwindow merging in viewer-beta. 2013-01-24 16:22:49 -05:00
llxml merging in viewer-beta. 2013-01-24 16:22:49 -05:00
lscript Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
mac_crash_logger merging in viewer-beta. 2013-01-24 16:22:49 -05:00
mac_updater merging in viewer-beta. 2013-01-24 16:22:49 -05:00
media_plugins merging in viewer-beta. 2013-01-24 16:22:49 -05:00
newview BUILDFIX: merge cleanup 2013-01-25 17:58:11 -05:00
test merging in viewer-beta. 2013-01-24 16:22:49 -05:00
test_apps/llplugintest
tools/vstool
viewer_components merging in viewer-beta. 2013-01-24 16:22:49 -05:00
win_crash_logger
win_updater
CMakeLists.txt
edit-me-to-trigger-new-build.txt
fix-incredibuild.py