Latif Khalifa
|
8584e6da4c
|
Merge branch 'master' into meshupload
Conflicts:
indra/llcommon/llhash.h
indra/newview/CMakeLists.txt
indra/newview/llfloatermodelpreview.cpp
indra/newview/llfloatermodelpreview.h
indra/newview/llpanelprofile.h
|
2013-01-30 00:36:31 +01:00 |
|
Drake Arconis
|
9f7e81cec2
|
Alt Compiler fixes
|
2013-01-08 06:17:39 -05:00 |
|
Shyotl
|
d71210e942
|
Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)
|
2013-01-07 14:44:54 -06:00 |
|
Drake Arconis
|
edb144bd1d
|
Fixed ugly workaround for compiler detection
Corrected ugly workaround for compiler detection in code with
correct definition in llpreprocessor.h and updated various #if
to reflect this.
|
2012-07-10 14:15:59 -04:00 |
|
Drake Arconis
|
cb0f4f8f10
|
Added support for Intel c++ Composer Xe
Added support for building with Intel C++ Composer Xe
Fixed a warning thrown by it
|
2012-07-08 10:29:28 -04:00 |
|
Drake Arconis
|
ece9dda7b4
|
Initial support for the Clang compiler and numerous warning fixes
|
2012-07-02 19:45:41 +00:00 |
|
Hazim Gazov
|
7a86d01598
|
Imported existing code
|
2010-04-02 02:48:44 -03:00 |
|