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

Timestamp:

May 28, 2006, 3:48:13 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the gui branche back
merged with command:
​https://svn.orxonox.net/orxonox/branches/gui
no conflicts

File:

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

trunk/src/lib/Makefile.am

@@ -28 +28 @@
                 util/file.cc \
                 util/directory.cc \
+                util/timer.cc \
                 \
                 data/data_tank.cc
@@ -49 +50 @@
                 util/file.h \
                 util/directory.h \
+                util/timer.h \
                 \
                 util/loading/resource_manager.h \