69054ad134
Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs |
||
---|---|---|
.. | ||
AssemblyInfo.cs | ||
CommandConsole.cs | ||
ConsoleBase.cs | ||
ConsoleDisplayList.cs | ||
ConsoleDisplayTable.cs | ||
ConsolePluginCommand.cs | ||
ConsoleUtil.cs | ||
LocalConsole.cs | ||
MockConsole.cs | ||
OpenSimAppender.cs | ||
RemoteConsole.cs |