| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | fix missing proprieties get, etc | UbitUmarov | 2015-09-08 | 1 | -8/+10 |
| * | seems to compile ( tests comented out) | UbitUmarov | 2015-09-02 | 1 | -147/+3 |
| * | bad merge? | UbitUmarov | 2015-09-01 | 1 | -31/+179 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... | Melanie | 2013-10-06 | 1 | -1/+1 |
| | |\ | |||||
| | | * | * Fix a null ref that causes a stack unwind when crossing borders. Less stac... | teravus | 2013-09-16 | 1 | -1/+2 |
| | * | | Merge branch 'master' into careminster | Melanie | 2013-10-06 | 1 | -1/+1 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'avination-current' into careminster | Melanie | 2013-09-16 | 1 | -0/+1 |
| | |\ \ \ | | |_|/ | |/| | | |||||
| | | * | | * Fix a null ref that causes a stack unwind when crossing borders. Less stac... | teravus | 2013-08-24 | 1 | -0/+1 |
| | * | | | Merge branch 'master' into careminster | Melanie | 2013-08-13 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-07-18 | 1 | -2/+21 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-05-01 | 1 | -3/+4 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-04-10 | 1 | -1/+6 |
| | |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| | * | | | | | | Merge branch 'master' into careminster | Melanie | 2013-02-27 | 1 | -1/+0 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-02-12 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-02-05 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-01-31 | 1 | -14/+151 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-01-24 | 2 | -2/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-01-24 | 2 | -41/+307 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-01-16 | 1 | -0/+157 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | JustinCC's core re-merge | Melanie | 2013-01-16 | 1 | -28/+80 |
| | * | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-12-18 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-12-16 | 1 | -9/+31 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-12-07 | 1 | -1/+24 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-15 | 1 | -0/+33 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-19 | 1 | -6/+8 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-16 | 2 | -20/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-13 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-12 | 1 | -11/+8 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-06-26 | 2 | -6/+27 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' into careminster | Melanie | 2012-05-17 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | Added a invalidCollisionSoundUUID so that scripts can stop all collision sou... | UbitUmarov | 2012-05-16 | 1 | -0/+2 |
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-05-09 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-04-24 | 1 | -0/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-18 | 1 | -1/+26 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-15 | 1 | -213/+135 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-14 | 1 | -22/+55 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-02-09 | 1 | -1/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-01-26 | 1 | -8/+17 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit '5607fd3af828846291de3358067bb1214619489e' into bigmerge | Melanie | 2011-10-25 | 1 | -22/+46 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit '3cf7fb4eca2ad57835311e8098868f2571709392' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Revert "Trigger changed event with CHANGED_TELEPORT when teleporting ... | Melanie | 2010-12-03 | 1 | -7/+10 |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Trigger changed event with CHANGED_TELEPORT when teleporting to anoth... | Melanie | 2010-12-03 | 1 | -10/+7 |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-27 | 1 | -7/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-22 | 1 | -2/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually set the PrivateBinPath in XEngine so relocating the scripts | Melanie | 2010-10-16 | 1 | -3/+4 |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change XEngine to use the new constant | Melanie Thielker | 2010-08-06 | 1 | -1/+1 |
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |