diff options
| author | Melanie | 2012-01-23 00:24:31 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-23 00:24:31 +0000 |
| commit | cd2bf64b873b4f34ead9f37a9f0e4605266e3617 (patch) | |
| tree | 2824d0d90620f05f6aa7306ac506172f9826b8d5 /OpenSim/Framework/FriendListItem.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-cd2bf64b873b4f34ead9f37a9f0e4605266e3617.zip opensim-SC-cd2bf64b873b4f34ead9f37a9f0e4605266e3617.tar.gz opensim-SC-cd2bf64b873b4f34ead9f37a9f0e4605266e3617.tar.bz2 opensim-SC-cd2bf64b873b4f34ead9f37a9f0e4605266e3617.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
Diffstat (limited to 'OpenSim/Framework/FriendListItem.cs')
0 files changed, 0 insertions, 0 deletions