Beeks 7eca5b9fcc Merge branch 'master' of github.com:Beeks/Ascent ...

Conflicts:
	indra/newview/skins/default/xui/en-us/panel_friends.xml

2010-10-26 23:08:41 -04:00

..

cmake

Bunch of fixes from Shyotl

2010-10-02 17:10:46 -04:00

copy_win_scripts

Bunch of fixes from Shyotl

2010-10-02 17:10:46 -04:00

lib/python

removing those damn pyc files

2010-04-21 07:49:26 -03:00

linux_crash_logger

Imported existing code

2010-04-02 02:48:44 -03:00

llaudio

Fixing GCC 4.0 build issue. Thanks again, Shyotl!

2010-10-04 23:38:00 -07:00

llcharacter

-Sanity checks from snowglobe. ...

2010-10-01 22:51:50 -04:00

llcommon

RP mode for IMs. Versioning. Dickdongs.

2010-10-24 01:14:00 -04:00

llcrashlogger

Imported existing code

2010-04-02 02:48:44 -03:00

llimage

-Sanity checks from snowglobe. ...

2010-10-01 22:51:50 -04:00

llimagej2coj

Fixing a Microsoftism. Thanks Shyotl!

2010-10-04 23:21:52 -07:00

llinventory

THE BIGGIE.

2010-09-22 06:48:48 -04:00

llmath

Minor tweaks -

2010-09-17 20:02:06 -04:00

llmessage

THE BIGGIE.

2010-09-22 06:48:48 -04:00

llplugin

Imported existing code

2010-04-02 02:48:44 -03:00

llprimitive

New color tag system is basically in, but commented out. Color works, but takes a while to update for the user.

2010-09-03 16:38:05 -04:00

llrender

-Sanity checks from snowglobe. ...

2010-10-01 22:51:50 -04:00

llui

When are these ever used? Causes a strange build error on OS X.

2010-10-04 23:18:14 -07:00

llvfs

Git is hard. Let's go shopping. (Branding changes, minor cleanup, cache isolated, new Vorbis libs in install.xml)

2010-09-26 22:54:00 -07:00

llwindow

Fixed the History and Teleport panels in Instant Messages.

2010-08-22 22:22:24 -04:00

llxml

Imported existing code

2010-04-02 02:48:44 -03:00

lscript

-Sanity checks from snowglobe. ...

2010-10-01 22:51:50 -04:00

mac_crash_logger

Imported existing code

2010-04-02 02:48:44 -03:00

mac_updater

Imported existing code

2010-04-02 02:48:44 -03:00

media_plugins

Imported existing code

2010-04-02 02:48:44 -03:00

newview

Merge branch 'master' of github.com:Beeks/Ascent

2010-10-26 23:08:41 -04:00

test

Imported existing code

2010-04-02 02:48:44 -03:00

test_apps

f

2010-08-22 15:14:30 -04:00

tools/vstool

Fixed several compile errors with VS2005

2010-04-23 02:10:18 -03:00

win_crash_logger

Imported existing code

2010-04-02 02:48:44 -03:00

win_updater

Imported existing code

2010-04-02 02:48:44 -03:00

CMakeLists.txt

Fixing a build error related to debug output in contact groups code.

2010-09-15 03:29:40 -04:00

develop.py

Bunch of fixes from Shyotl

2010-10-02 17:10:46 -04:00

fmodfilestructure.zip

Custom NSI installer template added to fmodfilestructure.zip, goes into \indra\build-VC80\newview\release

2010-08-23 00:35:10 -04:00