repair git-merge bug
commita948fabfca117a031818115ffc7a5bab6116ad5c
authorGerber van der Graaf <gerber_graaf@users.sourceforge.net>
Mon, 28 Jan 2013 08:58:12 +0000 (28 09:58 +0100)
committerGerber van der Graaf <gerber_graaf@users.sourceforge.net>
Mon, 28 Jan 2013 08:58:12 +0000 (28 09:58 +0100)
treea50bac2ed4c52da07c55ca35952aca0e862e8254
parentd3a25bf3525ba4f3886cb72ba567dfa4dbc7dad0
repair git-merge bug
include/gpiv/gpiv-valid_proc.h
lib/piv_proc.c