diff options
| author | Melanie Thielker | 2014-08-11 18:45:34 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-08-11 18:45:34 +0200 |
| commit | 1e0dc83d8051fcfd193e4a6de629d175ddba5753 (patch) | |
| tree | 12b974f57214dbe88b19f9ae7b1fea512ca8b56a /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |
| parent | Fix a condition check (diff) | |
| parent | Fix a condition check (diff) | |
| download | opensim-SC-1e0dc83d8051fcfd193e4a6de629d175ddba5753.zip opensim-SC-1e0dc83d8051fcfd193e4a6de629d175ddba5753.tar.gz opensim-SC-1e0dc83d8051fcfd193e4a6de629d175ddba5753.tar.bz2 opensim-SC-1e0dc83d8051fcfd193e4a6de629d175ddba5753.tar.xz | |
Merge branch 'avination-current'
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs')
0 files changed, 0 insertions, 0 deletions