Merge branch 'master' into reorder_tof

This commit is contained in:
Atgeirr Flø Rasmussen committed 2012-10-05 09:20:37 +02:00
commit 5b6dd72cc2
14 files changed
+511 -79

No files matched your search

+1 -3
View File
@@ -5,9 +5,7 @@ $(OPM_BOOST_CPPFLAGS)
# All targets link to the library
LDADD = \
$(top_builddir)/lib/libopmcore.la \
$(BOOST_FILESYSTEM_LIB) \
$(BOOST_SYSTEM_LIB)
$(top_builddir)/lib/libopmcore.la
# ----------------------------------------------------------------------
# Declare products (i.e., the example programs).