phoenix-firestorm/indra/llinventory
Kelly Washington e03bb0606a merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
..
llcategory.cpp Print done when done. 2007-01-02 08:33:20 +00:00
llcategory.h Print done when done. 2007-01-02 08:33:20 +00:00
lleconomy.cpp svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-02 21:24:47 +00:00
lleconomy.h svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-02 21:24:47 +00:00
llinventory.cpp svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-02 21:24:47 +00:00
llinventory.h svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-02 21:24:47 +00:00
llinventorytype.cpp svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-02 21:24:47 +00:00
llinventorytype.h svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-02 21:24:47 +00:00
lllandmark.cpp Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release. 2007-02-02 17:28:58 +00:00
lllandmark.h Result of svn merge -r56461:56474 svn+ssh://svn/svn/linden/branches/llscene-shuffle into release. 2007-01-04 23:38:26 +00:00
llnotecard.cpp merge -r61423:62602 svn/branches/maintenance --> release 2007-05-30 17:39:09 +00:00
llnotecard.h svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 --> release 2007-03-14 23:03:50 +00:00
llparcel.cpp merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
llparcel.h merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
llparcelflags.h result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release 2007-06-13 18:02:37 +00:00
llpermissions.cpp svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-02 21:24:47 +00:00
llpermissions.h merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
llpermissionsflags.h Print done when done. 2007-01-02 08:33:20 +00:00
llsaleinfo.cpp merge -r61423:62602 svn/branches/maintenance --> release 2007-05-30 17:39:09 +00:00
llsaleinfo.h Print done when done. 2007-01-02 08:33:20 +00:00
lltransactionflags.cpp Print done when done. 2007-01-02 08:33:20 +00:00
lltransactionflags.h Print done when done. 2007-01-02 08:33:20 +00:00
lltransactiontypes.h svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-08 22:20:26 +00:00
lluserrelations.cpp merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
lluserrelations.h merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00