Pilar a038fbd31e Merge branch 'master' into review_usage_and_construction_catalogs ... # Conflicts: # city_model_structure/building_demand/thermal_zone.py # imports/schedules/comnet_schedules_parameters.py # imports/schedules/doe_idf.py # imports/usage/comnet_usage_parameters.py		2022-12-06 14:25:56 -05:00
..
citygml_classes	Partial corretion geojson importer	2022-11-25 12:40:13 -05:00
helpers	Merge branch 'master' into review_usage_and_construction_catalogs	2022-12-06 14:25:56 -05:00
citygml.py	Merge remote-tracking branch 'origin/master' into geojson	2022-11-28 13:13:55 -05:00
geojson.py	merge changes with main	2022-11-28 13:44:02 -05:00
gpandas.py	merge changes with main	2022-11-28 13:44:02 -05:00
obj.py	merge changes with main	2022-11-28 13:44:02 -05:00
osm_subway.py	License header change to better reflect the coder and code contributors, remove the Model creators from the contributors as it may be misleading	2022-04-08 09:35:33 -04:00
rhino.py	merge changes with main	2022-11-28 13:44:02 -05:00