Merge remote-tracking branch 'upstream/master' into develop

keyboards/murcielago/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Murciélago",
+  "manufacturer": "elagil",
   "url": "",
   "maintainer": "elagil",
+  "usb": {
+    "vid": "0x6166",
+    "pid": "0x0001",
+    "device_version": "0.0.2"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [ 

keyboards/murcielago/rev1/config.h

@@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6166  // af
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0002
-#define MANUFACTURER elagil
-#define PRODUCT Murciélago
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 6