Merge remote-tracking branch 'Ilos/patch-2' into develop

This commit is contained in:
Iwan Timmer 2015-08-08 23:26:21 +02:00
commit c6d117f78e

View File

@ -19,15 +19,15 @@ btn_west = 304
btn_south = 305
btn_north = 307
btn_east = 306
btn_select = 313
btn_start = 317
btn_select = 312
btn_start = 313
btn_mode = 316
btn_thumbl = 314
btn_thumbr = 315
btn_tl = 308
btn_tr = 309
btn_tl2 = -1
btn_tr2 = -1
btn_tl2 = 310
btn_tr2 = 311
btn_dpad_up = -1
btn_dpad_down = -1
btn_dpad_left = -1