new file:   LICENSE.txt
	new file:   __init__.py
	new file:   __init__.pyc
	new file:   _debug_info.py
	new file:   _debug_info.pyc
	new file:   config.py
	new file:   config.pyc
	new file:   correct/__init__.py
	new file:   correct/__init__.pyc
	new file:   correct/_fourdd_interface.so
	new file:   correct/attenuation.py
	new file:   correct/attenuation.pyc
	new file:   correct/dealias.py
	new file:   correct/dealias.pyc
	new file:   correct/phase_proc.py
	new file:   correct/phase_proc.pyc
	new file:   correct/setup.py
	new file:   correct/setup.pyc
	new file:   correct/tests/attenuation_rays.npz
	new file:   correct/tests/reference_ray_plot.png
	new file:   correct/tests/reference_rays.npz
	new file:   correct/tests/test_attenuation.py
	new file:   correct/tests/test_dealias.py
	new file:   correct/tests/test_phase_proc.py
	new file:   default_config.py
	new file:   default_config.pyc
	new file:   graph/__init__.py
	new file:   graph/__init__.pyc
	new file:   graph/_cm.py
	new file:   graph/_cm.pyc
	new file:   graph/cm.py
	new file:   graph/cm.pyc
	new file:   graph/common.py
	new file:   graph/common.pyc
	new file:   graph/gridmapdisplay.py
	new file:   graph/gridmapdisplay.pyc
	new file:   graph/plot_cfradial.py
	new file:   graph/plot_cfradial.pyc
	new file:   graph/plot_mdv.py
	new file:   graph/plot_mdv.pyc
	new file:   graph/plot_rsl.py
	new file:   graph/plot_rsl.pyc
	new file:   graph/radar_display.py
	new file:   graph/radar_display.pyc
	new file:   graph/setup.py
	new file:   graph/setup.pyc
	new file:   graph/tests/test_common.py
	new file:   graph/tests/test_gridmapdisplay.py
	new file:   graph/tests/test_plot_cfradial.py
	new file:   graph/tests/test_plot_mdv.py
	new file:   graph/tests/test_plot_rsl.py
	new file:   graph/tests/test_radar_display.py
	new file:   io/__init__.py
	new file:   io/__init__.pyc
	new file:   io/_rsl_interface.so
	new file:   io/_sigmetfile.so
	new file:   io/auto_read.py
	new file:   io/auto_read.pyc
	new file:   io/cfradial.py
	new file:   io/cfradial.pyc
	new file:   io/common.py
	new file:   io/common.pyc
	new file:   io/gamic_hdf5.py
	new file:   io/gamic_hdf5.pyc
	new file:   io/grid.py
	new file:   io/grid.pyc
	new file:   io/mdv.py
	new file:   io/mdv.pyc
	new file:   io/nexrad_archive.py
	new file:   io/nexrad_archive.pyc
	new file:   io/nexrad_cdm.py
	new file:   io/nexrad_cdm.pyc
	new file:   io/nexrad_level2.py
	new file:   io/nexrad_level2.pyc
	new file:   io/radar.py
	new file:   io/radar.pyc
	new file:   io/rsl.py
	new file:   io/rsl.pyc
	new file:   io/setup.py
	new file:   io/setup.pyc
	new file:   io/sigmet.py
	new file:   io/sigmet.pyc
	new file:   io/tests/test_auto_read.py
	new file:   io/tests/test_cfradial.py
	new file:   io/tests/test_grid.py
	new file:   io/tests/test_mdv.py
	new file:   io/tests/test_nexrad_archive.py
	new file:   io/tests/test_nexrad_cdm.py
	new file:   io/tests/test_nexrad_level2.py
	new file:   io/tests/test_radar.py
	new file:   io/tests/test_rsl.py
	new file:   io/tests/test_sigmet.py
	new file:   map/__init__.py
	new file:   map/__init__.pyc
	new file:   map/_load_nn_field_data.so
	new file:   map/ball_tree.so
	new file:   map/ckdtree.so
	new file:   map/grid_mapper.py
	new file:   map/grid_mapper.pyc
	new file:   map/setup.py
	new file:   map/setup.pyc
	new file:   map/tests/test_map.py
	new file:   retrieve/__init__.py
	new file:   retrieve/__init__.pyc
	new file:   retrieve/convv.py
	new file:   retrieve/convv.pyc
	new file:   retrieve/qpe.py
	new file:   retrieve/qpe.pyc
	new file:   retrieve/setup.py
	new file:   retrieve/setup.pyc
	new file:   setup.py
	new file:   setup.pyc
	new file:   snesbitt/phase_proc.py
	new file:   testing/__init__.py
	new file:   testing/__init__.pyc
	new file:   testing/data/README
	new file:   testing/data/baseline_figures/example_cfradial_ppi.png
	new file:   testing/data/baseline_figures/example_cfradial_rhi.png
	new file:   testing/data/baseline_figures/example_mdv_ppi.png
	new file:   testing/data/baseline_figures/example_mdv_rhi.png
	new file:   testing/data/baseline_figures/example_sigmet_ppi.png
	new file:   testing/data/baseline_figures/example_sigmet_rhi.png
	new file:   testing/data/check_nexrad_dummy.py
	new file:   testing/data/dummify_nexrad_file.py
	new file:   testing/data/example_cfradial_ppi.nc
	new file:   testing/data/example_cfradial_rhi.nc
	new file:   testing/data/example_interpolatedsonde.cdf
	new file:   testing/data/example_mdv_ppi.mdv
	new file:   testing/data/example_mdv_rhi.mdv
	new file:   testing/data/example_nexrad_archive.bz2
	new file:   testing/data/example_nexrad_archive_compressed.ar2v
	new file:   testing/data/example_nexrad_cdm.bz2
	new file:   testing/data/example_rays.npz
	new file:   testing/data/example_sigmet_ppi.sigmet
	new file:   testing/data/example_sigmet_rhi.sigmet
	new file:   testing/data/make_single_ray.py
	new file:   testing/data/make_small_cfradial_ppi.py
	new file:   testing/data/make_small_cfradial_rhi.py
	new file:   testing/data/make_small_interp_sonde.py
	new file:   testing/data/make_small_mdv_ppi.py
	new file:   testing/data/make_small_mdv_rhi.py
	new file:   testing/data/make_small_nexrad_archive.sh
	new file:   testing/data/make_small_nexrad_archive_compressed.py
	new file:   testing/data/make_small_nexrad_cdm.sh
	new file:   testing/data/make_small_sigmet_ppi.py
	new file:   testing/data/make_small_sigmet_rhi.py
	new file:   testing/data/quick_plot_cfradial_ppi.py
	new file:   testing/data/quick_plot_cfradial_rhi.py
	new file:   testing/data/quick_plot_mdv_ppi.py
	new file:   testing/data/quick_plot_mdv_rhi.py
	new file:   testing/data/quick_plot_sigmet_ppi.py
	new file:   testing/data/quick_plot_sigmet_rhi.py
	new file:   testing/sample_files.py
	new file:   testing/sample_files.pyc
	new file:   testing/sample_objects.py
	new file:   testing/sample_objects.pyc
	new file:   testing/setup.py
	new file:   testing/setup.pyc
	new file:   tests/custom_config.py
	new file:   tests/test_config.py
	new file:   tests/test_debug_info.py
	new file:   util/__init__.py
	new file:   util/__init__.pyc
	new file:   util/datetime_utils.py
	new file:   util/datetime_utils.pyc
	new file:   util/met.py
	new file:   util/met.pyc
	new file:   util/setup.py
	new file:   util/setup.pyc
	new file:   util/sigmath.py
	new file:   util/sigmath.pyc
	new file:   version.py
	new file:   version.pyc
Merge branch 'master' of https://github.com/swnesbitt/pyart-gpm

Conflicts:
	__init__.pyc
	_debug_info.pyc
	config.pyc
	correct/__init__.pyc
	correct/attenuation.pyc
	correct/dealias.pyc
	correct/phase_proc.pyc
	correct/setup.pyc
	default_config.pyc
	graph/__init__.pyc
	graph/_cm.pyc
	graph/cm.pyc
	graph/common.pyc
	graph/gridmapdisplay.pyc
	graph/plot_cfradial.pyc
	graph/plot_mdv.pyc
	graph/plot_rsl.pyc
	graph/radar_display.pyc
	graph/setup.pyc
	io/__init__.pyc
	io/_rsl_interface.so
	io/_sigmetfile.so
	io/auto_read.pyc
	io/cfradial.pyc
	io/common.pyc
	io/gamic_hdf5.pyc
	io/grid.pyc
	io/mdv.pyc
	io/nexrad_archive.pyc
	io/nexrad_cdm.pyc
	io/nexrad_level2.pyc
	io/radar.pyc
	io/rsl.pyc
	io/setup.pyc
	io/sigmet.pyc
	map/__init__.pyc
	map/_load_nn_field_data.so
	map/ball_tree.so
	map/ckdtree.so
	map/grid_mapper.pyc
	map/setup.pyc
	retrieve/setup.pyc
	setup.pyc
	testing/__init__.pyc
	testing/sample_files.pyc
	testing/sample_objects.pyc
	testing/setup.pyc
	util/setup.pyc
	version.pyc