Pilar a0613201e3 Merge remote-tracking branch 'origin/master' ... # Conflicts: # city_model_structure/attributes/surface.py # city_model_structure/city.py		2021-04-13 15:11:39 -04:00
..
attributes	created epw_weather_parameters.py	2021-04-13 15:09:13 -04:00
bixi_feature.py	reorganized properties in city_object and building	2021-04-01 10:36:07 -04:00
building.py	Partial correction for unit test after merge	2021-04-07 14:33:08 -04:00
city_object.py	max_x, max_y, max_z (and min) changed to envelope_upper_corner (and lower)	2021-04-01 15:51:09 -04:00
city.py	Merge remote-tracking branch 'origin/master'	2021-04-13 15:11:39 -04:00
composting_plant.py	reorganized properties in city_object and building	2021-04-01 10:36:07 -04:00
monthly_to_hourly_demand.py	modifications in classes for energyADE	2021-03-16 12:19:35 -04:00
subway_entrance.py	reorganized properties in city_object and building	2021-04-01 10:36:07 -04:00
tree.py	reorganized properties in city_object and building	2021-04-01 10:36:07 -04:00