Ansariel 364a14a8aa Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llcommon/llprofilercategories.h		2024-06-21 22:45:12 +02:00
..
tests	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-05-22 20:27:05 +02:00
CMakeLists.txt	…
llimage.cpp	Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600	2024-06-13 01:54:18 +02:00
llimage.h	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-06-11 19:04:21 +02:00
llimagebmp.cpp	Fix line endlings	2024-05-22 22:40:26 +03:00
llimagebmp.h	Fix line endlings	2024-05-22 22:40:26 +03:00
llimagedimensionsinfo.cpp	Fix line endlings	2024-05-22 22:40:26 +03:00
llimagedimensionsinfo.h	…
llimagedxt.cpp	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-06-11 19:04:21 +02:00
llimagedxt.h	…
llimagefilter.cpp	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-06-10 21:53:31 +02:00
llimagefilter.h	…
llimagej2c.cpp	Fix line endlings	2024-05-22 22:40:26 +03:00
llimagej2c.h	…
llimagejpeg.cpp	Fix line endlings	2024-05-22 22:40:26 +03:00
llimagejpeg.h	Fix line endlings	2024-05-22 22:40:26 +03:00
llimagepng.cpp	Fix line endlings	2024-05-22 22:40:26 +03:00
llimagepng.h	…
llimagetga.cpp	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-06-10 21:53:31 +02:00
llimagetga.h	…
llimageworker.cpp	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-06-21 22:45:12 +02:00
llimageworker.h	Fix line endlings	2024-05-22 22:40:26 +03:00
llmapimagetype.h	…
llpngwrapper.cpp	Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings	2024-06-01 15:49:26 +02:00
llpngwrapper.h	Fix line endlings	2024-05-22 22:40:26 +03:00