diff options
author | Thomas Grimshaw | 2010-04-05 22:11:11 +0200 |
---|---|---|
committer | Thomas Grimshaw | 2010-04-05 22:11:11 +0200 |
commit | 07b4889eab148efedb5ea554b2ed5eb4ca30752c (patch) | |
tree | 1dca4c8b04e17e57772a999d55a38a1346eebd01 /OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs | |
parent | This commit adds some randomness to object persistence. It's a Work In Progre... (diff) | |
parent | Fix some overlooked merge conflicts that got committed (diff) | |
download | opensim-SC-07b4889eab148efedb5ea554b2ed5eb4ca30752c.zip opensim-SC-07b4889eab148efedb5ea554b2ed5eb4ca30752c.tar.gz opensim-SC-07b4889eab148efedb5ea554b2ed5eb4ca30752c.tar.bz2 opensim-SC-07b4889eab148efedb5ea554b2ed5eb4ca30752c.tar.xz |
Merge branch 'master' of ssh://TOR/var/git/careminster
Diffstat (limited to 'OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs')
0 files changed, 0 insertions, 0 deletions