# Conflicts: # indra/cmake/Boost.cmake # indra/llxml/llcontrol.cpp # indra/newview/llcallingcard.cpp # indra/newview/lleventpoll.cpp # indra/newview/llviewermessage.cpp # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/skins/default/xui/en/strings.xml # indra/newview/viewer_manifest.py |
||
|---|---|---|
| .. | ||
| tests | ||
| CMakeLists.txt | ||
| include_kdu_xxxx.h | ||
| llimagej2ckdu.cpp | ||
| llimagej2ckdu.h | ||
| llkdumem.cpp | ||
| llkdumem.h | ||