9208e6f5fa
Conflicts: .gitignore deleted: indra/lib/python/indra/__init__.pyc deleted: indra/lib/python/indra/base/__init__.pyc deleted: indra/lib/python/indra/base/llsd.pyc deleted: indra/lib/python/indra/base/lluuid.pyc deleted: indra/lib/python/indra/ipc/__init__.pyc deleted: indra/lib/python/indra/ipc/compatibility.pyc deleted: indra/lib/python/indra/ipc/llmessage.pyc deleted: indra/lib/python/indra/ipc/tokenstream.pyc deleted: indra/lib/python/indra/util/__init__.pyc deleted: indra/lib/python/indra/util/fastest_elementtree.pyc deleted: indra/lib/python/indra/util/helpformatter.pyc deleted: indra/lib/python/indra/util/llmanifest.pyc deleted: indra/lib/python/uuid.pyc modified: indra/newview/dofloaterhex.cpp modified: indra/newview/doinventorybackup.cpp modified: indra/newview/hgfloatertexteditor.cpp modified: indra/newview/llinventorybridge.cpp
The file is empty.