Melanie
|
27aca49a1f
|
Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge
|
2011-10-25 03:26:51 +01:00 |
|
Melanie
|
c8dfef1583
|
Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmerge
|
2011-10-25 03:26:44 +01:00 |
|
Melanie
|
a055dd39ac
|
Merge commit '79d5bc9beb445ca07cff9ecbd91d89b2a57e14da' into bigmerge
|
2011-10-25 03:26:34 +01:00 |
|
Melanie
|
8131ad0fb6
|
Merge commit '48295793b0d07579d9e31744ae6969df647f663c' into bigmerge
|
2011-10-25 03:26:27 +01:00 |
|
Melanie
|
740077a291
|
Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmerge
|
2011-10-25 03:26:20 +01:00 |
|
Melanie
|
4e9457ca0c
|
Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge
Conflicts:
OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
|
2011-10-25 03:26:09 +01:00 |
|
Melanie
|
e94574196f
|
Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmerge
|
2011-10-25 03:19:55 +01:00 |
|
Melanie
|
271c798813
|
Merge commit 'c2272a755fc6d3b07bc9b87bd9b83f4ae063ce9f' into bigmerge
|
2011-10-25 03:19:49 +01:00 |
|
Melanie
|
84ea10a78c
|
Merge commit '3fc47275cff5f74e370a24f63f42a6bee023ee17' into bigmerge
|
2011-10-25 03:19:35 +01:00 |
|
Melanie
|
508f2ebb76
|
Merge commit '655aee44c4236d7023b9274645bf033b87b17131' into bigmerge
|
2011-10-25 03:19:30 +01:00 |
|
Melanie
|
98b7bd01cb
|
Merge commit '229ca09b7956f51fc2618dc35dff87cf04bf0fc9' into bigmerge
|
2011-10-25 03:19:16 +01:00 |
|
Melanie
|
02f0aa592d
|
Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge
|
2011-10-25 03:19:10 +01:00 |
|
Melanie
|
8639b037e1
|
Merge commit '30320505fa54640baf4ecaff8bb743f62ef01f86' into bigmerge
|
2011-10-25 03:18:59 +01:00 |
|
Melanie
|
de8cdbda15
|
Merge commit 'bc2da4eaadb0dbf8502d95fc2e40b1fdcc86e218' into bigmerge
|
2011-10-25 03:18:53 +01:00 |
|
Melanie
|
be2cfeb5c3
|
Merge commit 'c4f8da735914f9a9b1fb99f05313ba0537b528b9' into bigmerge
|
2011-10-25 03:18:49 +01:00 |
|
Melanie
|
da805d0cce
|
Merge commit '5d7eaedbebd408d948321dc474927fc72d3d98c5' into bigmerge
|
2011-10-25 03:18:38 +01:00 |
|
Melanie
|
56f3da7b5a
|
Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge
|
2011-10-25 03:18:29 +01:00 |
|
Melanie
|
1ae36695ba
|
Merge commit 'a1f05a289dd845edb7e3d163b84ceecc85374427' into bigmerge
|
2011-10-25 03:18:23 +01:00 |
|
Melanie
|
0531b73695
|
Merge commit '4241ee5dfab99d4e247624a2f368a8a931d2e54c' into bigmerge
|
2011-10-25 03:18:10 +01:00 |
|
Melanie
|
564563d273
|
Merge commit '30fe66d3ab534422407415817b570a66096c543b' into bigmerge
|
2011-10-25 03:18:04 +01:00 |
|
Melanie
|
6d4480c1ca
|
Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmerge
|
2011-10-25 03:17:59 +01:00 |
|
Melanie
|
3d0d84aff7
|
Merge commit '6837e44d0707e501795df2d690c6005f5ba1d591' into bigmerge
|
2011-10-25 03:17:45 +01:00 |
|
Melanie
|
e35835602f
|
Merge commit 'b63ec987b0a1692da4c5e84facf0ea149d4cfe90' into bigmerge
|
2011-10-25 03:17:40 +01:00 |
|
Melanie
|
e058b0822f
|
Merge commit 'f16d125027aba098e45dc026f9d507a430bc2b10' into bigmerge
|
2011-10-25 03:17:26 +01:00 |
|
Melanie
|
bfc0c96379
|
Merge commit '9ab2943abf5f890a53dc8ada48bf63ed15331c07' into bigmerge
|
2011-10-25 03:17:18 +01:00 |
|
Melanie
|
d1028b3647
|
Merge commit 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmerge
|
2011-10-25 03:17:11 +01:00 |
|
Melanie
|
68682d6faa
|
Merge commit '8b20faf06c4850df800945c8135aa90c2eebe034' into bigmerge
|
2011-10-25 03:16:58 +01:00 |
|
Melanie
|
04678836c3
|
Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmerge
|
2011-10-25 03:16:47 +01:00 |
|
Melanie
|
635b1bf18e
|
Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmerge
|
2011-10-25 03:16:40 +01:00 |
|
Melanie
|
85d40ce1d1
|
Merge commit '5607fd3af828846291de3358067bb1214619489e' into bigmerge
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
|
2011-10-25 03:16:26 +01:00 |
|
Melanie
|
df430d572d
|
Merge commit '3cf7fb4eca2ad57835311e8098868f2571709392' into bigmerge
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
|
2011-10-25 03:10:54 +01:00 |
|
Melanie
|
1bb0e3c800
|
Merge commit 'b45219065c7a81b3ec488b3a6734773c34268618' into bigmerge
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
|
2011-10-25 03:07:25 +01:00 |
|
Melanie
|
1ec82bb000
|
Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmerge
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
|
2011-10-25 03:06:18 +01:00 |
|
Melanie
|
89e973805d
|
Merge commit 'ecad9f9fd589f90d1c7a20faf14af0304804b616' into bigmerge
|
2011-10-25 02:57:01 +01:00 |
|
Melanie
|
a71c60ee6d
|
Merge commit 'd9184eceab5ff9087801b0f0d447dec2f5227a50' into bigmerge
|
2011-10-25 02:56:56 +01:00 |
|
Melanie
|
b6881187d0
|
Merge commit 'fe484ab331871e1419ee78afefca7c8856e2dfb4' into bigmerge
|
2011-10-25 02:56:45 +01:00 |
|
Melanie
|
752b744105
|
Merge commit '178b8d0926a53d82f54d60c088f36c7bad13dc87' into bigmerge
|
2011-10-25 02:56:40 +01:00 |
|
Melanie
|
1b87a0c229
|
Merge commit '4cffdf15ba320b71650ade9edddec2286b1c5258' into bigmerge
|
2011-10-25 02:56:30 +01:00 |
|
Melanie
|
3555987fe9
|
Merge commit '9f171041c950d55d86481cdcee7a04c623bea8b2' into bigmerge
|
2011-10-25 02:56:22 +01:00 |
|
Melanie
|
e1ff72209f
|
Merge commit '97c66f8eac648229b55ba5a000d57e4b9377c663' into bigmerge
|
2011-10-25 02:56:15 +01:00 |
|
Melanie
|
cdca0fb387
|
Merge commit '9d59b285bbc84aa620200e7da69be0f347dd69f4' into bigmerge
|
2011-10-25 02:56:03 +01:00 |
|
Melanie
|
f5e2bdebef
|
Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmerge
|
2011-10-25 02:55:57 +01:00 |
|
Melanie
|
71b4486356
|
Merge commit '581885da75c57250201b34e2d585d32c8f07089a' into bigmerge
|
2011-10-25 02:55:46 +01:00 |
|
Melanie
|
6a01246cc6
|
Merge commit '03202ada2918c0c0837e8de50e3a0436e4407c91' into bigmerge
|
2011-10-25 02:55:38 +01:00 |
|
Melanie
|
10dff1da7f
|
Merge commit '1d4cd76e8a8c64da71fc384ff9c654d7f4f849c1' into bigmerge
|
2011-10-25 02:55:25 +01:00 |
|
Melanie
|
2134f23da0
|
Merge commit 'f10a824e47549806c1fa647c4e9fba4c8cf6ad13' into bigmerge
|
2011-10-25 02:55:19 +01:00 |
|
Melanie
|
43751d0cfd
|
Merge commit '5515c45e3b42497f64f8e5846697471b1de952c5' into bigmerge
|
2011-10-25 02:55:14 +01:00 |
|
Melanie
|
7ac9463e35
|
Merge commit '71d221cdc090cdedf371ead534421bb7074908cd' into bigmerge
|
2011-10-25 02:55:01 +01:00 |
|
Melanie
|
90f17785c3
|
Merge commit '352002fd0b74a87f62ea82c76969e4110ba2542f' into bigmerge
|
2011-10-25 02:54:53 +01:00 |
|
Melanie
|
0cbba1da8d
|
Merge commit 'aeb4ff02744573cb91e8991bf9df81412b80e156' into bigmerge
|
2011-10-25 02:54:41 +01:00 |