diff options
| author | Jacek Antonelli | 2009-11-19 04:19:06 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2009-11-19 04:19:06 -0600 |
| commit | 1d443b7a94ed6f9ef1d408caef72fcbc0b1ee427 (patch) | |
| tree | e09ccbc010e326a48fd91ba15b58afd7fb836b3f /linden/indra/newview/featuretable_mac.txt | |
| parent | Fixed minor formatting issue in MANIFESTO.txt. (diff) | |
| parent | Fixed CMake setting errors (diff) | |
| download | meta-impy-1d443b7a94ed6f9ef1d408caef72fcbc0b1ee427.zip meta-impy-1d443b7a94ed6f9ef1d408caef72fcbc0b1ee427.tar.gz meta-impy-1d443b7a94ed6f9ef1d408caef72fcbc0b1ee427.tar.bz2 meta-impy-1d443b7a94ed6f9ef1d408caef72fcbc0b1ee427.tar.xz | |
Merge remote branch 'mccabe/1.3.0-next' into next
Conflicts:
linden/indra/cmake/00-Common.cmake
linden/indra/newview/skins/default/xui/de/floater_about.xml
linden/indra/newview/skins/default/xui/fr/floater_about.xml
linden/indra/newview/skins/default/xui/ja/floater_about.xml
linden/indra/newview/skins/default/xui/ko/floater_about.xml
linden/indra/newview/skins/default/xui/zh/floater_about.xml
linden/install.xml
Diffstat (limited to 'linden/indra/newview/featuretable_mac.txt')
| -rw-r--r-- | linden/indra/newview/featuretable_mac.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/featuretable_mac.txt b/linden/indra/newview/featuretable_mac.txt index fd2496d..15974c0 100644 --- a/linden/indra/newview/featuretable_mac.txt +++ b/linden/indra/newview/featuretable_mac.txt | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | version 19 | 1 | version 20 |
| 2 | 2 | ||
| 3 | // NOTE: This is mostly identical to featuretable_mac.txt with a few differences | 3 | // NOTE: This is mostly identical to featuretable_mac.txt with a few differences |
| 4 | // Should be combined into one table | 4 | // Should be combined into one table |