Changeset 9667 for code/trunk/src/libraries/network/WANDiscovery.h
- Timestamp:
- Aug 25, 2013, 9:08:42 PM (11 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core6 merged: 9552-9554,9556-9574,9577-9579,9585-9593,9596-9612,9626-9662
- Property svn:mergeinfo changed
-
code/trunk/src/libraries/network/WANDiscovery.h
r8858 r9667 31 31 #include "NetworkPrereqs.h" 32 32 #include "packet/ServerInformation.h" 33 #include "core/ConfigFileManager.h" 34 #include "core/OrxonoxClass.h" 35 #include "core/ConfigValueIncludes.h" 36 #include "core/CoreIncludes.h" 33 #include "core/config/Configurable.h" 34 #include "core/config/ConfigValueIncludes.h" 37 35 #include "MasterServerComm.h" 38 36 #include "MasterServerProtocol.h" … … 48 46 class _NetworkExport WANDiscovery 49 47 // tolua_end 50 : public OrxonoxClass48 : public Configurable 51 49 { // tolua_export 52 50 public:
Note: See TracChangeset
for help on using the changeset viewer.