aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/Meta7/textures/2660b114-1d66-3cde-e148-ebc2d1f963d5.j2c
diff options
context:
space:
mode:
authorDavid Seikel2011-02-20 20:31:57 +1000
committerDavid Seikel2011-02-20 20:31:57 +1000
commitd6666d0776985bada40f19c623b86d82a4113f92 (patch)
treeeb4d234a313c51b40f6d53d4a59bdc831a7cd0fc /linden/indra/newview/skins/Meta7/textures/2660b114-1d66-3cde-e148-ebc2d1f963d5.j2c
parentRemove catering to LL's probably illegal attempt to block copying of open sou... (diff)
parentReduce the logging spam to warnings. Debug was too much. (diff)
downloadmeta-impy-d6666d0776985bada40f19c623b86d82a4113f92.zip
meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.gz
meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.bz2
meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.xz
Merge branch 'weekly' into branding
Conflicts (solved): linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llappviewerwin32.cpp
Diffstat (limited to 'linden/indra/newview/skins/Meta7/textures/2660b114-1d66-3cde-e148-ebc2d1f963d5.j2c')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-11-15 17:56:35 +0000