Changeset 8293 in orxonox.OLD for trunk/src/lib/graphics/Makefile.am
- Timestamp:
- Jun 8, 2006, 11:11:37 PM (18 years ago)
-
orxonox/trunk: merged the osX-branche back here
merged with command:
svn merge https://svn.orxonox.net/orxonox/branches/osx . -r7763:HEAD
conflicts resolved, and everything is working as expected (or at least i hope so
)
- File:
-
- 1 edited
-
trunk/src/lib/graphics/Makefile.am (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/lib/graphics/Makefile.am
r7810 r8293 56 56 57 57 58 SUBDIRS = importer \ 59 spatial_separation 60 58 SUBDIRS = importer \ 59 spatial_separation 61 60 EXTRA_DIST =
Note: See TracChangeset
for help on using the changeset viewer.
