diff options
| author | Melanie | 2012-07-06 20:51:18 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-06 20:51:18 +0100 |
| commit | 26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2 (patch) | |
| tree | bf9802d765a4965dd1b42c4b2d3145b5813c0c1f /OpenSim/Data/MySQL | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | added llSetVelocity. will refuse to work on vehicles and on attachments ( th... (diff) | |
| download | opensim-SC-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.zip opensim-SC-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.gz opensim-SC-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.bz2 opensim-SC-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions