diff options
| author | David Seikel | 2011-03-20 17:02:40 +1000 |
|---|---|---|
| committer | David Seikel | 2011-03-20 17:02:40 +1000 |
| commit | 8c15fcec590c68337b8aa05d17793cd3c2a48068 (patch) | |
| tree | e233ecfa79c6fe22f47dc0eba44c0300dc0daa71 /linden/doc | |
| parent | The half arsed IRC support was broken. It's still not working, though it wor... (diff) | |
| parent | Merge remote-tracking branch 'jacek/exp' into exp (diff) | |
| download | meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.zip meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.gz meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.bz2 meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.xz | |
Merge remote-tracking branch 'mccabe/exp' into weekly
Conflicts: (Keeping these around as a record, there was some strangeness.
.gitignore
linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
linden/indra/newview/llfloaterregioninfo.cpp
linden/indra/newview/llfloatertos.cpp
linden/indra/newview/llpanellogin.cpp
linden/indra/newview/skins/default/html/en-us/loading-error/index.html
linden/indra/newview/skins/default/html/en-us/loading/loading.html
linden/indra/newview/skins/default/xui/en-us/floater_about.xml
linden/install.xml
Diffstat (limited to 'linden/doc')
| -rw-r--r-- | linden/doc/contributions.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt index d18b5ba..8aab5c8 100644 --- a/linden/doc/contributions.txt +++ b/linden/doc/contributions.txt | |||
| @@ -474,6 +474,7 @@ Nicholaz Beresford | |||
| 474 | Nicky Perian | 474 | Nicky Perian |
| 475 | IMP-680 | 475 | IMP-680 |
| 476 | IMP-685 | 476 | IMP-685 |
| 477 | IMP-741 | ||
| 477 | Nounouch Hapmouche | 478 | Nounouch Hapmouche |
| 478 | VWR-238 | 479 | VWR-238 |
| 479 | Patric Mills | 480 | Patric Mills |