diff options
| author | Melanie | 2012-02-26 15:15:47 +0100 |
|---|---|---|
| committer | Melanie | 2012-02-26 15:15:47 +0100 |
| commit | 356603fff94592ac95a4d1e0cdcb670c6603f926 (patch) | |
| tree | 04bffeb4b9862b94588b137860e9e1eb2dcafbe2 /OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs | |
| parent | Implement proper selection behavior (diff) | |
| parent | Implement KeyframedMotion selection behavior (diff) | |
| download | opensim-SC-356603fff94592ac95a4d1e0cdcb670c6603f926.zip opensim-SC-356603fff94592ac95a4d1e0cdcb670c6603f926.tar.gz opensim-SC-356603fff94592ac95a4d1e0cdcb670c6603f926.tar.bz2 opensim-SC-356603fff94592ac95a4d1e0cdcb670c6603f926.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
Diffstat (limited to 'OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs')
0 files changed, 0 insertions, 0 deletions