Latif Khalifa 8584e6da4c Merge branch 'master' into meshupload ...

Conflicts:
	indra/llcommon/llhash.h
	indra/newview/CMakeLists.txt
	indra/newview/llfloatermodelpreview.cpp
	indra/newview/llfloatermodelpreview.h
	indra/newview/llpanelprofile.h

2013-01-30 00:36:31 +01:00

..

aistatemachine

Fix example code.

2013-01-29 20:49:53 +01:00

cmake

Merge branch 'master' into meshupload

2013-01-30 00:36:31 +01:00

copy_win_scripts

…

cwdebug

New debug channel dc::snapshot.

2013-01-09 00:54:53 +01:00

lib/python

Removed ReleaseSSE2

2012-07-04 10:25:04 +00:00

libhacd

Linux64 support, integrated physics/decomposition

2013-01-13 03:23:56 +01:00

libndhacd

Linux64 support, integrated physics/decomposition

2013-01-13 03:23:56 +01:00

libopenjpeg

Take out buggy padding removal in OJ

2013-01-06 04:01:28 +01:00

libpathing

Linux64 support, integrated physics/decomposition

2013-01-13 03:23:56 +01:00

linux_crash_logger

Attempt to fix linking on newer linux

2011-12-23 18:31:47 +01:00

llappearance

Fix some compiler warnings/errors. Error in llinventorymodelbackgroundfetch was introduced by partial commit.

2013-01-20 17:10:38 -06:00

llaudio

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

llcharacter

Merge remote-tracking branch 'shyotl/sunshine'

2013-01-21 11:25:10 +01:00

llcommon

Merge branch 'master' into meshupload

2013-01-30 00:36:31 +01:00

llcrashlogger

Add getName() to every non-base class Responder object.

2013-01-11 04:15:55 +01:00

llimage

Merge branch 'master' into sunshine

2013-01-08 17:05:29 -06:00

llimagej2coj

OpenJPEG 1.5.2

2012-12-09 02:10:16 +01:00

llinventory

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

llmath

Merge remote-tracking branch 'shyotl/sunshine'

2013-01-21 11:25:10 +01:00

llmessage

Merge branch 'master' into meshupload

2013-01-30 00:36:31 +01:00

llplugin

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

llprimitive

Merge branch 'master' into meshupload

2013-01-30 00:36:31 +01:00

llqtwebkit

Compile error and warning fixes for DEBUG_CURLIO without CWDEBUG.

2012-11-23 03:19:39 +01:00

llrender

Some cleanup missed in merge.

2013-01-08 17:07:05 -06:00

llui

Merge remote-tracking branch 'lirusato/master'

2013-01-22 20:06:03 +01:00

llvfs

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

llwindow

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

llxml

Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git into sunshine

2013-01-08 17:06:08 -06:00

lscript

missed another spot with trailing spaces in aa functions, TNX LightDrake and Shyot1 :)

2012-11-14 21:37:36 -05:00

mac_crash_logger

…

mac_updater

…

newview

Merge branch 'master' into meshupload

2013-01-30 00:36:31 +01:00

plugins

Renamed FFLOAD/SAVE_LSL to FFLOAD/SAVE_SCRIPT

2013-01-07 20:11:18 +01:00

test

Removed dead code.

2012-07-23 18:15:11 +02:00

test_apps/llplugintest

General cleanup of OSX support - not done

2012-07-15 17:45:50 -04:00

tools/vstool

…

win_crash_logger

LLStringOps, LLStringUtilBase, and LLDate updated to V2. If dates go wonky this is where it's from

2011-05-15 22:50:56 -05:00

win_updater

…

CMakeLists.txt

Merge branch 'master' into meshupload

2013-01-30 00:36:31 +01:00

develop.py

Merge branch 'master' of github.com:singularity-viewer/SingularityViewer

2013-01-05 20:50:49 -05:00