924df14c5e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/VersionInfo.cs
2012-09-07 19:49:46 +01:00
0a71e3ab39
Add file to .gitignore
...
Add OpenSim.userprefs which is created by Monodevelop to .gitignore
2012-09-06 05:36:00 -04:00
899337b4a0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
2012-08-29 03:31:13 +01:00
8a7fbfb06a
adding some files to .gitignore that get generated when debugging in c# express with OpenSim.32BitLaunch as the startup project
2012-08-27 23:48:29 +01:00
007a45aa76
Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminster
2012-08-25 18:08:10 +01:00
632908db9e
adding sqlite journal files to .gitignore
2012-08-24 01:26:11 +01:00
771d79e83e
Merge branch 'master' into careminster
...
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
2012-07-28 00:39:36 +01:00
b23ab3ea85
adding asset cache and map tile directories to .gitignore
2012-07-27 23:37:24 +01:00
6a96c9546d
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-10-26 17:48:51 +01:00
66bdd20628
Add some things to .gitignore to make the status cleaner
2011-10-26 08:33:17 -04:00
7ab103c96f
Rewrite collision dictionary handling, cleans up deleted obects/avs. Fixes occasional collision event failure. ChOde only.
2010-07-13 20:37:13 +00:00
b9c6ee6eb2
removed from git *.VisualState.xml (automatically created by NUnit)
2010-04-28 11:41:39 +03:00
0718748ea4
Removed from git .../obj directories (created by VStudio)
2010-04-28 11:41:22 +03:00
7796033f0d
additional log files to ignore, also ignoring TestResult.xml
2009-09-09 09:56:07 +02:00
b324f88f86
Add UUIDs in bin/ScriptEngines to .gitignore.
2009-08-17 10:23:57 +09:00
eedb155502
Thanks jonc for a patch to ignore some Visual Studio and generated ini files.
2009-08-12 12:32:49 +09:00
bb64906a9c
Enable the console show version command and the viewer about command, to 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
2009-08-11 17:09:35 +01:00
115a552ade
ignore .svn directories, useful for the mirror
2009-08-07 13:29:42 -04:00
123884aefe
Add bin/*.db and bin/*.ini to .gitignore.
2009-07-11 11:47:22 +00:00
762703852e
- adding Makefile.local to .gitignore
2009-04-14 12:17:34 +00:00
2c4ccc2347
adding bin/ScriptEngines/*/*.{dll,state}, bin/j2kDecodeCache,
...
bin/UserAssets to .gitignore
2009-02-09 09:02:49 +00:00
40f32756cf
adding TAGS to .gitignore
2009-01-22 16:04:31 +00:00
b0e55577ff
Revert the rest of r7468
2008-11-25 18:59:10 +00:00
72c28c5120
Local changes
2008-11-25 18:39:36 +00:00
409e7262df
Mid-work, trying to fix region part insertion and retrieval
...
SQLite reports System NUll Reference, but works, inside
LoadItems, on SQLiteRegionData.cs
From: Arthur Rodrigo S Valadares <arthursv@linux.vnet.ibm.com>
2008-10-30 12:56:04 +00:00
50180984fa
- Inserted code coverage monocov. To run do nant test-cov.
...
Creates a new directory cov and exports to html files in
subdirectories.
2008-10-22 17:45:43 +00:00
a27352010a
Merge commit 'arthur/master'
2008-10-14 19:00:43 +00:00
a61cc1fcac
add pidb files to gitignore
2008-07-16 15:19:10 +00:00
de42154b62
added .gitignore which makes using git-svn easier
2008-07-09 23:59:53 +00:00
Melanie