Commit Graph

21 Commits

Author SHA1 Message Date
7917391625 commit changes 2020-05-19 17:18:47 -04:00
8bfb429527 integrate libs as submodule 2020-05-19 17:03:33 -04:00
0c830eb4b6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/modules.xml
#	.idea/vcs.xml
2020-05-19 17:02:12 -04:00
pilar
1abb43df8d error detected in usage parsing 2020-05-19 17:00:15 -04:00
aabcb55092 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/DynamicBuildingSimulation.iml
#	.idea/modules.xml
2020-05-19 11:58:35 -04:00
cd490bc406 integrate libs as submodule 2020-05-19 11:57:44 -04:00
pilar
86062d3ddd Merge remote-tracking branch 'origin/master' 2020-05-19 11:55:02 -04:00
pilar
4a8bb6451f trying submodule 2020-05-19 11:54:49 -04:00
c8a75e4784 integrate libs as submodule 2020-05-19 11:41:35 -04:00
ebccae14ef Remove bad integrated files 2020-05-19 11:25:28 -04:00
17fedf4c68 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	usage/usage_feeders/us_new_york_city_usage_parameters.py
2020-05-19 11:24:28 -04:00
f67e6ac043 Remove bad integrated files 2020-05-19 11:23:59 -04:00
pilar
f7f1254f77 trying submodule 2020-05-19 11:22:15 -04:00
a5257c69d1 Refactor files and folders location for better integration 2020-05-19 11:20:37 -04:00
5a750d342f Refactor files and folders location for better integration 2020-05-19 11:16:54 -04:00
pilar
8b53f62d9c Defined the structure 2020-05-18 13:56:54 -04:00
pilar
e11a1cc01d Test commit into two repositories 2020-05-18 13:30:03 -04:00
pilar
f3b8d48cc1 Clean repository 2020-05-18 13:05:54 -04:00
pilar
2ecfb3ed34 setup structure again 2020-05-02 00:33:06 +02:00
pilar
d1b8657d36 setup structure 2020-05-01 19:59:09 +02:00
pilar
a23cb89522 main file 2020-04-30 19:02:10 +02:00