Manolis Surligas 5ac7fa4759 Merge branch 'next' of https://github.com/satnogs/gr-satnogs into next ... # Conflicts: # grc/CMakeLists.txt # include/satnogs/CMakeLists.txt # lib/CMakeLists.txt # swig/satnogs_swig.i		2016-03-29 22:59:36 +03:00
..
CMakeLists.txt	Create the README and the OOT module structure.	2016-01-07 21:24:51 +02:00
satnogs_swig.i	Merge branch 'next' of https://github.com/satnogs/gr-satnogs into next	2016-03-29 22:59:36 +03:00