diff options
author | Melanie | 2010-03-02 04:43:36 +0000 |
---|---|---|
committer | Melanie | 2010-03-02 04:46:13 +0000 |
commit | bef311dfb9692ffefcafa5752e6da4d0823c8773 (patch) | |
tree | 56efb8190b32ad9b80eef9b15990ef44920d338e /OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs | |
parent | Changed the query in GetFriends in SQLite to match the one in MySql. (diff) | |
parent | Fix a few compiler warnings. (diff) | |
download | opensim-SC-bef311dfb9692ffefcafa5752e6da4d0823c8773.zip opensim-SC-bef311dfb9692ffefcafa5752e6da4d0823c8773.tar.gz opensim-SC-bef311dfb9692ffefcafa5752e6da4d0823c8773.tar.bz2 opensim-SC-bef311dfb9692ffefcafa5752e6da4d0823c8773.tar.xz |
Merge branch 'master' into presence-refactor
This is the big one. master is now presence-refactor (pre 0.7). A new branch 0.6.9-post-fixes and leading tag 0.6.9 has been created. The Presence-refactor
branch remains for experimental work.
Diffstat (limited to 'OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs')
0 files changed, 0 insertions, 0 deletions