Commit Graph

10 Commits

Author SHA1 Message Date
Siana Gearz
293e6a5487 Merge remote branch 'upstream/master'
Conflicts:
	indra/llcommon/llversionviewer.h
	indra/newview/English.lproj/InfoPlist.strings
	indra/newview/llappviewerlinux.cpp
2010-10-18 14:01:09 +02:00
Beeks
21d092705c fixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfix
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-10-10 21:55:19 -04:00
Siana Gearz
6192edf353 Revert "Fixes for Linux ID0"
This reverts commit 184de6a6c5.
2010-10-11 03:09:44 +02:00
Beeks
184de6a6c5 Fixes for Linux ID0
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-10-05 11:09:05 -04:00
Beeks
9e91f88696 Change in the linux code - Some old Inertia stuff was lurking undetected in it.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-22 06:39:14 -04:00
Hazim Gazov
f4857c6afb adding some floaters I forgot 2010-04-23 10:17:08 -03:00
Hazim Gazov
e204d77d52 added some settings from SLPE 2010-04-23 09:34:47 -03:00
Hazim Gazov
929694dc07 Added macro around texture exporter to ensure tpv compliance, started messing with develop.py 2010-04-19 23:12:15 -03:00
Hazim Gazov
0dbd278707 Added preliminary support for volume id checks on linux (depends on udev) 2010-04-19 19:22:46 -03:00
Hazim Gazov
7a86d01598 Imported existing code 2010-04-02 02:48:44 -03:00