Changeset 7256 in orxonox.OLD for trunk/src/lib/Makefile.am

Timestamp:

Mar 30, 2006, 11:45:31 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the preferences back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/preferences . -r7233:HEAD
no conflicts… nice work

File:

• trunk/src/lib/Makefile.am (modified) (2 diffs)

trunk/src/lib/Makefile.am

@@ -23 +23 @@
                 util/loading/factory.cc \
                 util/loading/dynamic_loader.cc \
+                util/preferences.cc \
                 \
                 data/data_tank.cc
@@ -39 +40 @@
                 util/executor/executor_specials.h \
                 util/executor/functor_list.h \
+                util/preferences.h \
                 \
                 util/loading/resource_manager.h \