Changeset 6340 in orxonox.OLD for branches/network_merged/src/subprojects/network/Makefile.am

Timestamp:

Dec 30, 2005, 1:52:26 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/newtork: merged the network branche for merging to the trunk
confilcts maily resolved in favor of trunk with some minor fixes

merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6146:HEAD

File:

• branches/network_merged/src/subprojects/network/Makefile.am (modified) (1 diff)

branches/network_merged/src/subprojects/network/Makefile.am

@@ -22 +22 @@
                   $(MAINSRCDIR)/lib/lang/class_list.cc \
                   $(MAINSRCDIR)/util/loading/load_param.cc \
+                  $(MAINSRCDIR)/util/loading/factory.cc \
                   $(MAINSRCDIR)/lib/util/substring.cc \
                   $(MAINSRCDIR)/util/loading/load_param_description.cc \