2243
2
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS

Conflicts:
	Capa_Presentació/nbproject/private/private.xml
Merge branch 'pol'

Conflicts:
	Capa_Presentació/nbproject/build-impl.xml
	Capa_Presentació/nbproject/genfiles.properties
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into pol

Conflicts:
	Capa_Presentació/nbproject/build-impl.xml
	Capa_Presentació/nbproject/genfiles.properties
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into pol
intro a la PQ
Merge branch 'joan'
PQ FUNCIONAL! con driver
omple PQ fet
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into pol
Vista modificada
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS
2
2
Merge branch 'josep'