aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/Sirikata/Protocol/Sirikata.pbj.cs
diff options
context:
space:
mode:
authormeta72010-08-10 09:17:30 -0700
committermeta72010-08-10 09:17:30 -0700
commitfb14390fb0446e225bca08ec2dc25960d1441728 (patch)
tree8b2b1ea36cf7aad262982ada6806bbb60e2c6fc2 /OpenSim/Client/Sirikata/Protocol/Sirikata.pbj.cs
parentResolve merge failure (diff)
downloadopensim-SC-fb14390fb0446e225bca08ec2dc25960d1441728.zip
opensim-SC-fb14390fb0446e225bca08ec2dc25960d1441728.tar.gz
opensim-SC-fb14390fb0446e225bca08ec2dc25960d1441728.tar.bz2
opensim-SC-fb14390fb0446e225bca08ec2dc25960d1441728.tar.xz
Note to self: don't break the build
Diffstat (limited to 'OpenSim/Client/Sirikata/Protocol/Sirikata.pbj.cs')
0 files changed, 0 insertions, 0 deletions