Hamlib/c++
Nate Bargmann 8c145cfc6b Merge branch 'API_3'
Conflicts:
	.gitignore
	Makefile.am
	NEWS
	c++/Makefile.am
	configure.ac
	hamlib.spec.in
	rpcrig/rpcrig.x
	rpcrig/rpcrig_backend.c
	rpcrig/rpcrig_backend.h
	rpcrig/rpcrig_proc.c
	rpcrig/rpcrigd.c
	rpcrot/rpcrot.x
	rpcrot/rpcrot_backend.c
	rpcrot/rpcrot_backend.h
	rpcrot/rpcrot_proc.c
	rpcrot/rpcrotd.c
	src/Makefile.am
	tests/rigctl.1
	tests/rotctl.1
2012-02-03 15:03:39 -06:00
..
Makefile.am
rigclass.cc
rotclass.cc
testcpp.cc