]> saetta.ns0.it Git - zakaudit/libzakaudit/commitdiff
projects / zakaudit / libzakaudit / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 467a9c1 476d04d)
Merge conflit.
authorAndrea Zagli <azagli@libero.it>
Tue, 24 Dec 2013 20:50:12 +0000 (21:50 +0100)
committerAndrea Zagli <azagli@libero.it>
Tue, 24 Dec 2013 20:50:12 +0000 (21:50 +0100)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
Unnamed repository; edit this file to name it for gitweb.