Richard Nelson
|
6029383a79
|
fixed eol and lack of copyright in resource.h
|
2010-04-14 20:12:22 -07:00 |
|
Richard Nelson
|
bd2b97fe40
|
EXT-2418 and EXT-6317
found out how to fix loading 32-bit cursors from embedded resource and moved them back there instead of freestanding files
|
2010-04-14 20:06:06 -07:00 |
|
Adam Moss
|
e188badaf2
|
QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314
Whew.
|
2009-02-03 17:56:26 +00:00 |
|
Aaron Brashears
|
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 |
|
Bryan O'Sullivan
|
9db949eec3
|
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
|
2008-06-02 21:14:31 +00:00 |
|
Josh Bell
|
98fd90ddd6
|
svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release
QAR-275 Parcel Media
Sam made me do it.
|
2008-02-14 01:45:59 +00:00 |
|
James Cook
|
711b9749a1
|
DEV-9328 DEV-9330 DEV-9334 Fixed license information in source files to match the wiki [[License Substition]] standard. Commit to release OK by Josh/Jwolk.
|
2008-01-24 20:26:50 +00:00 |
|
Christian Goetze
|
aa8b0cbe69
|
QAR-25 svn merge -r71797:71803 svn+ssh://svn/svn/linden/branches/logitech_lcd_4
|
2007-10-17 22:09:27 +00:00 |
|
Don Kjer
|
ad04e5fc55
|
revert: svn merge -r 64506:64505 svn+ssh://svn/svn/linden/release back into release
reverting jakes accidental check in
|
2007-06-29 01:49:41 +00:00 |
|
Jake Simpson
|
e3989d3848
|
Changes to make Logitech code more LL Code Standards compliant, plus remove all the SDK code and instead just used headers and an included lib that we build ourselves from the Trunk directory.
|
2007-06-29 01:24:26 +00:00 |
|
Don Kjer
|
60a09f20f4
|
Removing Logitech LCD code: svn merge -r 60616:60615 svn+ssh://svn/svn/linden/release into release
|
2007-05-08 20:42:04 +00:00 |
|
Jake Simpson
|
2f438a409e
|
svn merge -r 59608:60615 svn+ssh://svn.lindenlab.com/svn/linden/branches/jakesbranch --> release
Adding Logitech G15 keyboard and Z10 speaker support for those LCD windows.
|
2007-04-18 21:08:54 +00:00 |
|
James Cook
|
420b91db29
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |