diff options
| author | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
| commit | fdf944fb0355249d73c4e25ee86e9ffd378e7d4b (patch) | |
| tree | 2e5c51fe0e6d5757f984721e01cc097801d927e7 /linden/indra/newview/gpu_table.txt | |
| parent | Rebranded Windows-specific installer/support files. (diff) | |
| parent | Updated source to SL version 1.21.6. (diff) | |
| download | meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.zip meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.gz meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.bz2 meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.xz | |
Merge branch 'merge-1.21.6' into rebranding
Conflicts:
linden/indra/newview/installers/windows/installer_template.nsi
linden/indra/newview/llappviewer.cpp
Diffstat (limited to 'linden/indra/newview/gpu_table.txt')
| -rw-r--r-- | linden/indra/newview/gpu_table.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/gpu_table.txt b/linden/indra/newview/gpu_table.txt index 77b75e1..48af543 100644 --- a/linden/indra/newview/gpu_table.txt +++ b/linden/indra/newview/gpu_table.txt | |||
| @@ -139,9 +139,11 @@ Intel 945G .*Intel.*945G 0 1 | |||
| 139 | Intel 950 .*Intel.*950.* 0 1 | 139 | Intel 950 .*Intel.*950.* 0 1 |
| 140 | Intel 965 .*Intel.*965.* 0 1 | 140 | Intel 965 .*Intel.*965.* 0 1 |
| 141 | Intel G33 .*Intel.*G33.* 0 0 | 141 | Intel G33 .*Intel.*G33.* 0 0 |
| 142 | Intel G45 .*Intel.*G45.* 0 1 | ||
| 142 | Intel Bear Lake .*Intel.*Bear Lake.* 0 0 | 143 | Intel Bear Lake .*Intel.*Bear Lake.* 0 0 |
| 143 | Intel Broadwater .*Intel.*Broadwater.* 0 0 | 144 | Intel Broadwater .*Intel.*Broadwater.* 0 0 |
| 144 | Intel Brookdale .*Intel.*Brookdale.* 0 0 | 145 | Intel Brookdale .*Intel.*Brookdale.* 0 0 |
| 146 | Intel Eaglelake .*Intel.*Eaglelake.* 0 1 | ||
| 145 | Intel Montara .*Intel.*Montara.* 0 0 | 147 | Intel Montara .*Intel.*Montara.* 0 0 |
| 146 | Intel Springdale .*Intel.*Springdale.* 0 0 | 148 | Intel Springdale .*Intel.*Springdale.* 0 0 |
| 147 | Matrox .*Matrox.* 0 0 | 149 | Matrox .*Matrox.* 0 0 |