diff options
| author | Aleric Inglewood | 2010-11-09 16:06:12 +0100 |
|---|---|---|
| committer | Aleric Inglewood | 2010-11-09 16:06:12 +0100 |
| commit | 2f088795d249b1b240e34b697ed4d5dfa501f187 (patch) | |
| tree | e639cd9eb86bd3928717a072d7401115eaf9c3f9 /.gitignore | |
| parent | Merge remote branch 'robin/SNOW-713' into SNOW-713 (diff) | |
| parent | As we currently do not build the gstreamer plugin for windows, do not try to ... (diff) | |
| download | meta-impy-2f088795d249b1b240e34b697ed4d5dfa501f187.zip meta-impy-2f088795d249b1b240e34b697ed4d5dfa501f187.tar.gz meta-impy-2f088795d249b1b240e34b697ed4d5dfa501f187.tar.bz2 meta-impy-2f088795d249b1b240e34b697ed4d5dfa501f187.tar.xz | |
IMP-692: SNOW-713: Merge branch 'weekly' into SNOW-713
Conflicts:
linden/indra/newview/viewer_manifest.py
Trivial proximity collision. Resolved.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions