aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/assets/TexturesAssetSet/5bc11cd6-2f40-071e-a8da-0903394204f9.j2c
diff options
context:
space:
mode:
authorMelanie2012-08-31 01:32:18 +0100
committerMelanie2012-08-31 01:32:18 +0100
commit1b15144208d925bf1fe6c545616b533faf8945ea (patch)
treea7720bb8c2ddcdc1470cf991e26c62b2b1a46be9 /bin/assets/TexturesAssetSet/5bc11cd6-2f40-071e-a8da-0903394204f9.j2c
parentMerge branch 'avination' into careminster (diff)
parentReplace SendBannedUserList with Avination's version. Untested in core. Not ev... (diff)
downloadopensim-SC-1b15144208d925bf1fe6c545616b533faf8945ea.zip
opensim-SC-1b15144208d925bf1fe6c545616b533faf8945ea.tar.gz
opensim-SC-1b15144208d925bf1fe6c545616b533faf8945ea.tar.bz2
opensim-SC-1b15144208d925bf1fe6c545616b533faf8945ea.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
Diffstat (limited to 'bin/assets/TexturesAssetSet/5bc11cd6-2f40-071e-a8da-0903394204f9.j2c')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-20 13:54:10 +0000