Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2013-01-04 | 1 | -0/+2 |
|\ | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | updating config properties added during upgrade process, adding error log ↵ | SignpostMarv | 2013-01-03 | 1 | -0/+2 |
| | | | | | | | | file to doxygen config, adding doxygen output directory & error log to .gitignore | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-09-07 | 1 | -0/+1 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs | ||||
| * | Add file to .gitignore | BlueWall | 2012-09-06 | 1 | -0/+1 |
| | | | | | | | | Add OpenSim.userprefs which is created by Monodevelop to .gitignore | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-08-29 | 1 | -0/+4 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | ||||
| * | adding some files to .gitignore that get generated when debugging in c# ↵ | SignpostMarv | 2012-08-27 | 1 | -0/+4 |
| | | | | | | | | express with OpenSim.32BitLaunch as the startup project | ||||
* | | Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminster | Melanie | 2012-08-25 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | adding sqlite journal files to .gitignore | SignpostMarv | 2012-08-24 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-07-28 | 1 | -0/+2 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml | ||||
| * | adding asset cache and map tile directories to .gitignore | SignpostMarv | 2012-07-27 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 1 | -1/+17 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | Add some things to .gitignore to make the status cleaner | BlueWall | 2011-10-26 | 1 | -1/+17 |
| | | |||||
* | | Rewrite collision dictionary handling, cleans up deleted obects/avs. Fixes ↵ | Kitto Flora | 2010-07-13 | 1 | -0/+3 |
|/ | | | | occasional collision event failure. ChOde only. | ||||
* | removed from git *.VisualState.xml (automatically created by NUnit) | AlexRa | 2010-04-28 | 1 | -0/+1 |
| | |||||
* | Removed from git .../obj directories (created by VStudio) | AlexRa | 2010-04-28 | 1 | -0/+8 |
| | |||||
* | additional log files to ignore, also ignoring TestResult.xml | dr scofield (aka dirk husemann) | 2009-09-09 | 1 | -1/+10 |
| | |||||
* | Add UUIDs in bin/ScriptEngines to .gitignore. | Jeff Ames | 2009-08-17 | 1 | -0/+1 |
| | |||||
* | Thanks jonc for a patch to ignore some Visual Studio and generated ini files. | Jeff Ames | 2009-08-12 | 1 | -1/+9 |
| | |||||
* | Enable the console show version command and the viewer about command, to ↵ | Chris Down | 2009-08-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | show the last git commit hash together with the conmit date and time. The data is retrieved form a file bin/.version This file can be generated automatically using the post commit script by adding the following to the script: git log -n 1 --pretty="format:%h: %ci" > bin/.version This command can also be run manually to create the bin/.version file. This command genrates a short form of the commit hash and a date and time of the commit in ISO8601 format. If a full commit hash is required then change %h to %H The logic that is used to extract the deprecated svn revision is still included. It will be removed at a future date | ||||
* | ignore .svn directories, useful for the mirror | Sean Dague | 2009-08-07 | 1 | -0/+1 |
| | |||||
* | Add bin/*.db and bin/*.ini to .gitignore. | Jeff Ames | 2009-07-11 | 1 | -0/+2 |
| | |||||
* | - adding Makefile.local to .gitignore | Dr Scofield | 2009-04-14 | 1 | -0/+1 |
| | |||||
* | adding bin/ScriptEngines/*/*.{dll,state}, bin/j2kDecodeCache, | Dr Scofield | 2009-02-09 | 1 | -4/+8 |
| | | | | | | bin/UserAssets to .gitignore | ||||
* | adding TAGS to .gitignore | Dr Scofield | 2009-01-22 | 1 | -0/+1 |
| | |||||
* | Revert the rest of r7468 | Homer Horwitz | 2008-11-25 | 1 | -1/+0 |
| | |||||
* | Local changes | Homer Horwitz | 2008-11-25 | 1 | -0/+1 |
| | |||||
* | Mid-work, trying to fix region part insertion and retrieval | Sean Dague | 2008-10-30 | 1 | -0/+2 |
| | | | | | | | | SQLite reports System NUll Reference, but works, inside LoadItems, on SQLiteRegionData.cs From: Arthur Rodrigo S Valadares <arthursv@linux.vnet.ibm.com> | ||||
* | - Inserted code coverage monocov. To run do nant test-cov. | Sean Dague | 2008-10-22 | 1 | -0/+1 |
| | | | | | | Creates a new directory cov and exports to html files in subdirectories. | ||||
* | Merge commit 'arthur/master' | Sean Dague | 2008-10-14 | 1 | -0/+6 |
| | |||||
* | add pidb files to gitignore | Sean Dague | 2008-07-16 | 1 | -0/+1 |
| | |||||
* | added .gitignore which makes using git-svn easier | Sean Dague | 2008-07-09 | 1 | -0/+26 |