You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Michael Hansen
c339f947ba
Merge remote-tracking branch 'origin/master' into plString
Conflicts:
Sources/Plasma/CoreLib/hsStream.h
Sources/Plasma/FeatureLib/pfAudio/plListener.cpp
Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp
Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp
Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp
Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp
Sources/Plasma/FeatureLib/pfPython/cyMisc.h
Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp
Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp
Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h
Sources/Plasma/FeatureLib/pfPython/pyImage.cpp
Sources/Plasma/FeatureLib/pfPython/pyJournalBook.cpp
Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h
Sources/Plasma/NucleusLib/pnKeyedObject/plFixedKey.cpp
Sources/Plasma/NucleusLib/pnKeyedObject/plKeyImp.cpp
Sources/Plasma/NucleusLib/pnKeyedObject/plUoid.cpp
Sources/Plasma/NucleusLib/pnKeyedObject/plUoid.h
Sources/Plasma/NucleusLib/pnMessage/plMessage.h
Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h
Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp
Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpansExport.cpp
Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp
Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp
Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h
Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h
Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.cpp
Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.h
Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h
Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp
Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
Sources/Plasma/PubUtilLib/plPipeline/plPlates.cpp
Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.cpp
Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.h
Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.cpp
Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.h
Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.cpp
Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.h
Sources/Plasma/PubUtilLib/plSurface/plGrassShaderMod.cpp
|
13 years ago |
| .. |
|
Apps
|
Merge remote-tracking branch 'origin/master' into plString
|
13 years ago |
|
CoreLib
|
Merge remote-tracking branch 'origin/master' into plString
|
13 years ago |
|
FeatureLib
|
Merge remote-tracking branch 'origin/master' into plString
|
13 years ago |
|
NucleusLib
|
Merge remote-tracking branch 'origin/master' into plString
|
13 years ago |
|
PubUtilLib
|
Merge remote-tracking branch 'origin/master' into plString
|
13 years ago |
|
PythonLib
|
Convert custom HeadSpin integer types to standard types from stdint.h
|
13 years ago |
|
CMakeLists.txt
|
Completely kill off CoreLibExe
|
13 years ago |
