Changeset 2ac2935 in git for omalloc/configure.ac


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

  • omalloc/configure.ac

    r7e18d1 r2ac2935  
    1616AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # -Wno-extra-portability -Werror silent-rules
    1717m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
     18m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
    1819
    1920
Note: See TracChangeset for help on using the changeset viewer.