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

Timestamp:

May 18, 2006, 12:55:34 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the QT_GUI back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/qt_gui . -r7607:HEAD

absolutely no conflicts

File:

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

trunk/src/lib/Makefile.am

@@ -25 +25 @@
                 util/preferences.cc \
                 util/threading.cc \
+                util/file.cc \
+                util/directory.cc \
                 \
                 data/data_tank.cc
@@ -43 +45 @@
                 util/preferences.h \
                 util/threading.h \
-                util/osdir.h \
+                util/file.h \
+                util/directory.h \
                 \
                 util/loading/resource_manager.h \