d56393b134
Conflicts: indra/cmake/WebKitLibPlugin.cmake indra/llmessage/llurlrequest.cpp indra/plugins/webkit/media_plugin_webkit.cpp
27 lines
333 B
Plaintext
27 lines
333 B
Plaintext
/installed.xml
|
|
/indra/llcommon/llversionviewer.h
|
|
/indra/build-*
|
|
/indra/tools/vstool/obj/
|
|
*.aps
|
|
*.suo
|
|
*.vshost.exe
|
|
/bin/
|
|
/bin-release/
|
|
/bin
|
|
/bin-release
|
|
/indra/viewer-*
|
|
/indra/newview/vivox-runtime/
|
|
/indra/newview/dbghelp.dll
|
|
/libraries/
|
|
/lib/
|
|
*.pyc
|
|
*.orig
|
|
*.rej
|
|
*.bak
|
|
*~
|
|
*.DS_Store
|
|
/LICENSES/
|
|
/edited-files.txt
|
|
qtcreator-build/
|
|
/.pc
|