aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/.gitignore (follow)
Commit message (Collapse)AuthorAgeFilesLines
* bad merge?UbitUmarov2015-09-011-0/+3
|\
| * Merge branch 'master' into careminsterMelanie2013-11-231-1/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * \ Merge branch 'master' into careminsterMelanie2013-01-041-0/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ Merge branch 'master' into careminsterMelanie2012-09-071-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-08-291-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
| * \ \ \ \ Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminsterMelanie2012-08-251-0/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-07-281-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
| * \ \ \ \ \ \ Merge branch 'master' into bigmergeMelanie2011-10-261-1/+17
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | | | | | | Rewrite collision dictionary handling, cleans up deleted obects/avs. Fixes ↵Kitto Flora2010-07-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | occasional collision event failure. ChOde only.
* | | | | | | | | Added *.Tests.log to .gitignoreOren Hurvitz2015-08-111-0/+1
| | | | | | | | |
* | | | | | | | | PGSQL migrations for IM_Store, UserProfiles, removal of casting exception ↵Geir Nøklebye2015-07-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for UserProfiles and adding double precision to PGSQL Manager PGSQL migrations for IM_Store, UserProfiles, removal of casting exception for UserProfiles and adding double precision to PGSQL Manager. Fixes the Offline IM to Email toggle and prepares for fixing Offline IM. Signed-off-by: Oren Hurvitz <orenh@kitely.com>
* | | | | | | | | Git-ignore log files and console history filesOren Hurvitz2015-07-231-0/+5
| | | | | | | | |
* | | | | | | | | Changed the default XBakes directory to a local path: "./bakes".Oren Hurvitz2014-07-211-0/+1
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was an absolute path. Now it's a sibling of the maptiles directory. This fixes http://opensimulator.org/mantis/view.php?id=7063
* | | | | | | | Ignore *.suo and *.user as these are user specific preference files from ↵Justin Clark-Casey (justincc)2013-11-161-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio http://stackoverflow.com/questions/72298/should-i-add-the-visual-studio-suo-and-user-files-to-source-control
* | | | | | | | minor: Add OpenSim.v11.suo to .gitignore file.Justin Clark-Casey (justincc)2013-11-161-0/+4
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This is generated if a vs2010 OpenSim.sln is loaded into vs2012 As per http://opensimulator.org/mantis/view.php?id=6839
* | | | | | | updating config properties added during upgrade process, adding error log ↵SignpostMarv2013-01-031-0/+2
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | file to doxygen config, adding doxygen output directory & error log to .gitignore
* | | | | | Add file to .gitignoreBlueWall2012-09-061-0/+1
| |_|_|_|/ |/| | | | | | | | | | | | | | Add OpenSim.userprefs which is created by Monodevelop to .gitignore
* | | | | adding some files to .gitignore that get generated when debugging in c# ↵SignpostMarv2012-08-271-0/+4
| |_|_|/ |/| | | | | | | | | | | express with OpenSim.32BitLaunch as the startup project
* | | | adding sqlite journal files to .gitignoreSignpostMarv2012-08-241-0/+1
| |_|/ |/| |
* | | adding asset cache and map tile directories to .gitignoreSignpostMarv2012-07-271-0/+2
| |/ |/|
* | Add some things to .gitignore to make the status cleanerBlueWall2011-10-261-1/+17
|/
* removed from git *.VisualState.xml (automatically created by NUnit)AlexRa2010-04-281-0/+1
|
* Removed from git .../obj directories (created by VStudio)AlexRa2010-04-281-0/+8
|
* additional log files to ignore, also ignoring TestResult.xmldr scofield (aka dirk husemann)2009-09-091-1/+10
|
* Add UUIDs in bin/ScriptEngines to .gitignore.Jeff Ames2009-08-171-0/+1
|
* Thanks jonc for a patch to ignore some Visual Studio and generated ini files.Jeff Ames2009-08-121-1/+9
|
* Enable the console show version command and the viewer about command, to ↵Chris Down2009-08-111-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 mirrorSean Dague2009-08-071-0/+1
|
* Add bin/*.db and bin/*.ini to .gitignore.Jeff Ames2009-07-111-0/+2
|
* - adding Makefile.local to .gitignoreDr Scofield2009-04-141-0/+1
|
* adding bin/ScriptEngines/*/*.{dll,state}, bin/j2kDecodeCache,Dr Scofield2009-02-091-4/+8
| | | | | | bin/UserAssets to .gitignore
* adding TAGS to .gitignoreDr Scofield2009-01-221-0/+1
|
* Revert the rest of r7468Homer Horwitz2008-11-251-1/+0
|
* Local changesHomer Horwitz2008-11-251-0/+1
|
* Mid-work, trying to fix region part insertion and retrievalSean Dague2008-10-301-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 Dague2008-10-221-0/+1
| | | | | | Creates a new directory cov and exports to html files in subdirectories.
* Merge commit 'arthur/master'Sean Dague2008-10-141-0/+6
|
* add pidb files to gitignoreSean Dague2008-07-161-0/+1
|
* added .gitignore which makes using git-svn easierSean Dague2008-07-091-0/+26
generated by cgit v1.1 at 2024-11-19 04:40:16 +0000