diff options
| author | Dan Lake | 2011-10-06 12:22:15 -0700 |
|---|---|---|
| committer | Dan Lake | 2011-10-06 12:22:15 -0700 |
| commit | 08f264d096e1dca535a64e683fa5ab5918368085 (patch) | |
| tree | 0e898f21be0cca8a6249f78e534c9ec3a98528e2 /Makefile | |
| parent | Refactor ScenePresence so gets and sets are through properties. Added private... (diff) | |
| parent | Added back UserAccount that creates random UUID for new account. (diff) | |
| download | opensim-SC_OLD-08f264d096e1dca535a64e683fa5ab5918368085.zip opensim-SC_OLD-08f264d096e1dca535a64e683fa5ab5918368085.tar.gz opensim-SC_OLD-08f264d096e1dca535a64e683fa5ab5918368085.tar.bz2 opensim-SC_OLD-08f264d096e1dca535a64e683fa5ab5918368085.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions