a36033853a
STORM-168 : Python modules cleanup
2010-09-16 14:27:42 -07:00
e588d1f284
svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654
...
QAR-1654 merge completed.
2009-07-01 00:22:05 +00:00
99660542bb
Adding back the setting of "DEBUG", the lack of which caused many unit
...
tests to fail.
2009-05-19 15:19:39 +00:00
6df2755ba6
Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462
2009-05-18 23:38:35 +00:00
2768539bfe
svn merge -r116334:116916 svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rad-chilies-trunkmerge-2
2009-04-08 22:39:01 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
14a5879c88
svn merge -r104949:105037 svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rad-chilies-06-release-merge
...
QAR-1048: Distributed L$ Transactions > Rad Chilies 06 Indra items
2008-12-09 22:41:28 +00:00
b2bfb128e7
Merged into release with command:
...
=================================
svn merge -r100865:101402 svn+ssh://svn/svn/linden/branches/purge-dpo-code-for-merge .
QAR-951 : Sandbox QA for DEV 20842 - Ensure DPO is not enabled accidentally
QAR-967 : Merge Build for DEV 20842 - Ensure DPOis not enabled accidentally
QA tested: Beast, Oskar
DEV's fulfilled as part of this branch:
======================================
DEV-20842 Prevent accidental activation of DPO procs
DEV-23028 Mac build fails - link error dual inclusion
DEV-20824 VWR-9255: Build fails on mac_updater and mac_crash_logger targets due to info.plist problems
DEV-22997 Xcode project: 'server' target has no dependencies
DEV-23353 Friend request custom messages come through as an asset tag.
DEV-23309 Voice Chat Indicator does not show active voice status
DEV-23187 Can't teleport to home location
2008-11-07 00:07:44 +00:00
cb7abfd595
Master QAR-807 passed.
...
Sub-QARs
1. QAR-765 Rad chilies 04 to Release
2. QAR-799 Merge PHP Framework 4 changes to release
3. QAR-801 Merge Buildme for startlocationfix
svn merge -r93906:94028 svn+ssh://svn/svn/linden/branches/combo-merge-qar-765-799 .
2008-08-21 22:09:21 +00:00
40d2bb564d
QAR-622 merge -r91846:91877 svn+ssh://svn/svn/linden/branches/scut-newstyle-5
2008-07-10 16:52:33 +00:00
52333fc830
svn merge -r87349:87423 svn+ssh://svn.lindenlab.com/svn/linden/branches/escrow/liquid-banjo-03-merge release dataserver-is-deprecated
2008-05-13 21:07:14 +00:00
4192700475
svn merge -r86582:86825 svn+ssh://svn/svn/linden/branches/nq-extension-for-merge-1 .
...
Original Jira: https://jira.lindenlab.com/browse/DEV-11178 (Proposal: To rename named query files to take an extension .nq)
Sandbox Jira: https://jira.lindenlab.com/browse/QAR-470 (Test a massive rename of named query files from being extensionless to having a .nq extension)
Merge Buildme: https://jira.lindenlab.com/browse/QAR-473
Original Code Review: BillC
2008-05-06 20:26:22 +00:00
8eea75dc3f
svn merge -r 79841:79886 svn+ssh://svn.lindenlab.com/svn/linden/branches/self-contained-unit-test --> release
...
QAR-291/QAR-284/QAR-246 - Self-Contained Unit Test
2008-02-15 18:47:45 +00:00
7b7dd4e6f6
svn merge -r74808:74832 svn+ssh://svn/svn/linden/branches/qa-dpo-9a
2007-12-01 01:29:28 +00:00
9763105427
Result of svn merge -r70716:70807 svn+ssh://svn/svn/linden/branches/open-py-libs into release.
2007-09-28 23:41:17 +00:00
33ce57b485
Result of svn merge -r68268:69863 svn+ssh://svn/svn/linden/branches/entity-router into release.
2007-09-19 16:59:05 +00:00
80dfa222fd
Result of svn merge -r69150:69158 svn+ssh://svn/svn/linden/branches/named-queries-py3 into release.
2007-09-10 20:10:56 +00:00
Merov Linden