jkriege2 78908c7472 Merge branch 'master' of https://github.com/KiCad/kicad-library into modify_resistor_3Dmodels ... # Conflicts: # library/device.lib		2017-01-12 22:51:25 +01:00
..
packages3d	Merge branch 'master' of https://github.com/KiCad/kicad-library into modify_resistor_3Dmodels	2017-01-12 22:51:25 +01:00
CMakeLists.txt	Remove more unused install locations	2016-08-06 16:47:23 +02:00