projects / libradsec.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0718244 3d954bf)
Merge remote-tracking branch 'origin/master' into debian
authorSam Hartman <hartmans@painless-security.com>
Thu, 6 Mar 2014 13:30:39 +0000 (08:30 -0500)
committerSam Hartman <hartmans@painless-security.com>
Thu, 6 Mar 2014 13:30:39 +0000 (08:30 -0500)
In particular update root of tree

1  2 
Makefile.am patch | diff1 | diff2 | blob | history
libradsec.spec.in patch | diff1 | diff2 | blob | history
radius/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
Simple merge
diff --cc libradsec.spec.in
Simple merge
diff --cc radius/Makefile.am
Simple merge
Unnamed repository; edit this file 'description' to name the repository.