diff options
| author | David Seikel | 2011-06-12 21:18:18 +1000 |
|---|---|---|
| committer | David Seikel | 2011-06-12 21:18:18 +1000 |
| commit | 5c192c92bf02910d93956068017daa2b9e4b80ba (patch) | |
| tree | 9c1bbbcfd6443e5b0df08bd212b3bd5027891e74 /linden/indra/newview/kokuastreamingaudio.cpp | |
| parent | Rejig skins again. (diff) | |
| parent | Updated app_settings/default_grids.xml from our online grid list. (diff) | |
| download | meta-impy-5c192c92bf02910d93956068017daa2b9e4b80ba.zip meta-impy-5c192c92bf02910d93956068017daa2b9e4b80ba.tar.gz meta-impy-5c192c92bf02910d93956068017daa2b9e4b80ba.tar.bz2 meta-impy-5c192c92bf02910d93956068017daa2b9e4b80ba.tar.xz | |
Merge remote-tracking branch 'jacek/next' into next
Conflicts (manualy merged):
linden/indra/newview/app_settings/default_grids.xml
linden/indra/newview/primbackup.cpp
linden/indra/newview/skins/default/xui/en-us/floater_about.xml
linden/indra/newview/skins/default/xui/en-us/notifications.xml
InWorldz specific crap removed.
Diffstat (limited to 'linden/indra/newview/kokuastreamingaudio.cpp')
0 files changed, 0 insertions, 0 deletions