Merge branch 'master' of git://git.linux-ax25.org/pub/scm/ralf/ax25-tools

Conflicts:
	ax25/axspawn.c

1 files changed, 3 insertions, 3 deletions

diff --git a/hdlcutil/fl/xfhdlcchpar_main.cxx b/hdlcutil/fl/xfhdlcchpar_main.cxx
index 8ebee3d..4b01138 100644
--- a/hdlcutil/fl/xfhdlcchpar_main.cxx
+++ b/hdlcutil/fl/xfhdlcchpar_main.cxx
@@ -58,7 +58,7 @@ void cb_update(Fl_Widget *widget, void *udata)
 	cp.ppersist = (int)(ppersist->value());
 	cp.fulldup = !!fulldup->value();
 	ret = hdrvc_set_channel_access_param(cp);
-	if (ret < 0) 
+	if (ret < 0)
 		perror("hdrvc_set_channel_access_param");
 }
 
@@ -71,7 +71,7 @@ void cb_quit(Fl_Button *, long)
 
 /* ---------------------------------------------------------------------- */
 
-static const char *usage_str = 
+static const char *usage_str =
 "[-i smif]\n"
 "  -i: specify the name of the baycom kernel driver interface\n\n";
 
@@ -79,7 +79,7 @@ static const char *usage_str =
 
 int main(int argc, char *argv[])
 {
-        int c, i;
+	int c, i;
 	int ret;
 	struct hdrvc_channel_params cp;