Ignore:
Timestamp:
Dec 7, 2012, 3:41:00 PM (11 years ago)
Author:
Alexander Dreyer <adreyer@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
ec1006cbd9971c4271d05aefada775ef29d762a6
Parents:
7e18d198148353f88708cfa20f738ac338cb1f556554ca42ebe1277c9afe7990970390905a6e1cf0
Message:
Merge conflict resolved
File:
1 edited

Legend:

Unmodified
Added
Removed
  • dyn_modules/syzextra/Makefile.am

    r7e18d1 r2ac2935  
    3131
    3232AMLDFLAGS       =
    33 # -L${abs_top_builddir}/Singular -L${abs_top_builddir}/numeric -L${abs_top_builddir}/kernel \
    34 # -L${abs_top_builddir}/libpolys/polys $(USE_FACTORY) -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/findexec
     33# -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel \
     34# -L${top_builddir}/libpolys/polys $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/findexec
    3535
    3636
Note: See TracChangeset for help on using the changeset viewer.