phoenix-firestorm/indra
andreykproductengine 23e2dcce9d fixing merge conflicts 2014-08-21 20:59:48 +03:00
..
cmake Merge. Refresh from viewer-release after 3.7.11 release. 2014-07-08 17:29:48 -04:00
copy_win_scripts
integration_tests Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile errors 2014-05-06 18:21:04 -07:00
lib/python
linux_crash_logger
linux_updater
llappearance Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365. 2014-06-02 22:32:16 +01:00
llaudio Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
llcharacter Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365. 2014-06-02 22:32:16 +01:00
llcommon Pulled in fix for maint-4184 blurry textures 2014-08-01 14:26:33 -07:00
llcorehttp sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
llcrashlogger sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
llimage merge changes for 3.7.10-release 2014-06-23 14:03:12 -04:00
llimagej2coj
llinventory MAINT-4292 FIXED Make Merchant Outbox Folder not movable (protected) 2014-07-31 20:11:17 +03:00
llkdu
llmath Merge viewer-release and become version 3.7.12 2014-07-07 14:49:45 -07:00
llmessage Appears to fix MAINT-4184 2014-07-22 17:24:00 -07:00
llplugin MAINT-4009: Patching a leak of LLPluginSharedMemory objects from the LLPluginProcessParent class. 2014-05-20 21:03:13 +01:00
llprimitive Merge downstream code and become 3.7.12 2014-07-07 16:17:53 -07:00
llrender Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365. 2014-06-02 22:32:16 +01:00
llui fixing merge conflicts 2014-08-21 20:59:48 +03:00
llvfs merge changes for 3.7.7-release 2014-05-07 11:09:04 -04:00
llwindow Merge downstream code and become 3.7.12 2014-07-07 16:17:53 -07:00
llxml merge changes for 3.7.7-release 2014-05-07 11:09:04 -04:00
lscript Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
mac_crash_logger
mac_updater
media_plugins All: Committing to llqtwebkit2 and the future. Updating all libraries. 2014-06-03 19:37:58 -04:00
newview fixing merge conflicts 2014-08-21 20:59:48 +03:00
test merge changes for 3.7.9-release 2014-06-16 11:42:37 -04:00
test_apps All: Committing to llqtwebkit2 and the future. Updating all libraries. 2014-06-03 19:37:58 -04:00
tools/vstool
viewer_components Merge. Refresh from viewer-release after 3.7.9 release. 2014-06-16 16:41:52 -04:00
win_crash_logger
win_updater
CMakeLists.txt
edit-me-to-trigger-new-build.txt Merge. Refresh from viewer-release after 3.7.9 release. 2014-06-16 16:41:52 -04:00
fix-incredibuild.py