summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Expand)Author
2009-10-02Moved a couple of C++-specific warning flags from GCC_WARNINGS to GCC_CXX_WAR...Monroe Linden
2009-08-31Merge with trunkBryan O'Sullivan
2009-08-31svn merge -r130875:131962 svn+ssh://svn.lindenlab.com/svn/linden/branches/plu...Adam Moss
2009-08-28DEV-38596: Introduce Mani's LL_ADD_INTEGRATION_TEST macro.Nat Goodspeed
2009-08-27svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/mo...Monroe Williams
2009-08-21svn merge -r130238:130240 svn+ssh://svn.lindenlab.com/svn/linden/branches/lin...Adam Moss
2009-07-16Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.Mark Palange
2009-07-14QAR-1651Dave Hiller
2009-07-06Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also U...James Cook
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-06-19result of "svn merge -r123757:124890 svn+ssh://svn.lindenlab.com/svn/linden/b...Paul Oppenheim
2009-06-02Small brainoBryan O'Sullivan
2009-05-19Fix to develop.py to build on 64 bit windows.Mark Palange
2009-05-04QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3Adam Moss
2009-04-30svn merge -r118008:118374 svn+ssh://svn.lindenlab.com/svn/linden/branches/cg/...Christian Goetze
2009-04-20Retry. Build system fixes for library-library dependencies, ported from skin...James Cook
2009-04-17Back out last commit, because it breaks mapserver build on linux, dammit.James Cook
2009-04-17Build system fixes for library-library dependencies, ported from skinning-7. ...James Cook
2009-04-13merge -r116796:116932 svn+ssh://svn.lindenlab.com/svn/linden/branches/http-te...Christian Goetze
2009-04-10Working around DEV-30401 by yanking the etch 32bit build code until the viewe...Christian Goetze
2009-04-09Get 32-bit builds going on 64-bit Debian Etch.Bryan O'Sullivan
2009-03-27Removed a newline in string definition - cmake does not support multiline str...Christian Goetze
2009-03-27Drop an unnecessary sed from linden.mass.Bryan O'Sullivan
2009-03-20svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Dave Simmons
2009-03-09svn merge -r113780:113785Adam Moss
2009-03-02Clean up use of tutBryan O'Sullivan
2009-02-26Fixed check to ensure the tests file actually existsJim Purbrick
2009-02-26Go a different route - do not include tut tests in open source builds and con...Christian Goetze
2009-02-25svn merge -r108815:112761 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop
2009-02-25Fix build of buffer_file with g++ 4.3Bryan O'Sullivan
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render...Brad Kittenbrink
2009-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-12-22Revert one openal -> openal-soft replacement - reviewed by MossChristian Goetze
2008-12-21Carry through andrew's rename of openal to openal-soft into cmake, see if tha...Christian Goetze
2008-12-18Added Cmake test macrosDave Hiller
2008-12-05Don't link the simulator with iconv.dll on Windows.Kyle Ambroff
2008-12-05indra/cmake/APR.cmake: Fix windows simulator build so it still dymanically li...Kyle Ambroff
2008-12-02QAR-1040 maint-viewer-11 + OpenAL combo mergemeAdam Moss
2008-11-21Merging the changes in viewer_1-22-0 (1.22 RC0) back into trunk, revs. 101837...Mark Palange
2008-11-19QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge -r102882:...James Cook
2008-11-12svn merge -c102054Adam Moss
2008-11-07Merged into release with command:Kartic Krishnamurthy
2008-10-29Added search path for Microsoft DirectX SDK (August 2008), the latest version...James Cook
2008-10-28Allow use of Python 2.6, in case it's useful for OSS builds.Bryan O'Sullivan
2008-10-10svn merge -r99056:99248 svn+ssh://svn.lindenlab.com/svn/linden/branches/andre...Andrew Meadows
2008-10-09QAR-907: svn merge -r 98908:98910 svn+ssh://svn/svn/linden/qa/sim-metrics/sim...Don Kjer
2008-09-24DEV-19146 / Don't hard-code Windows paths.Bryan O'Sullivan
2008-09-23QAR-849 merge maint-viewer-10-merge 96838-97237 -> releaseSteven Bennetts
2008-09-05Fix dataserver build on OS X.Bryan O'Sullivan