From: Arjen Baart <arjen@andromeda.nl>
Date: Sat, 26 Oct 2019 12:58:54 +0000 (+0200)
Subject: Resolved merge conflict in src/Makefile.am
X-Git-Tag: V0.3~11
X-Git-Url: http://www.andromeda.nl/gitweb/?a=commitdiff_plain;h=dc49c8d658da71ee7f08100b8bbdb4492b6dbeb1;p=libacl.git

Resolved merge conflict in src/Makefile.am
---

dc49c8d658da71ee7f08100b8bbdb4492b6dbeb1
diff --cc src/Makefile.am
index c9b1cf2,ba6837c..9988245
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1,7 -1,7 +1,9 @@@
  lib_LTLIBRARIES = libACL.la
  
  libACL_la_SOURCES = string.cpp regex.cpp date.cpp parsedate.c dateyacc.y datelex.c \
 -                    hour.cpp utc.cpp
 +                    hour.cpp utc.cpp \
 +                    Integer.cpp
 +
+ libACL_la_LDFLAGS = -version-info 0:2:0
+ 
 -include_HEADERS = String.h date.h
 +include_HEADERS = String.h date.h Integer.h