aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs
diff options
context:
space:
mode:
authorKitto Flora2009-12-22 00:33:31 -0500
committerKitto Flora2009-12-22 00:33:31 -0500
commit93b930b9370b1439c4416c08a45fe7f23a5862c7 (patch)
treee3546d86b64e9e2c13c4fba40a364857bfb0a8e7 /OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs
parentInclude ChOdePlugin (diff)
parentShould not commit without compiling (diff)
downloadopensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.zip
opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.tar.gz
opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.tar.bz2
opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.tar.xz
Fix conflicts
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs')
0 files changed, 0 insertions, 0 deletions