{"push_id":948420610,"size":3,"distinct_size":3,"ref":"refs/heads/master","head":"306074670d65784b0ec1832f22d3d34fef5f282e","before":"1f6e999efad61750954a7307e104da42692b88c6","commits":[{"sha":"fd715dc79d52c09560879501868d05adc0d637f1","author":{"email":"9f0b9f67774a67d7fcb0f3b17147067610e0a160@encompass8.cn","name":"zhaopan"},"message":"1212","distinct":true,"url":"https://api.github.com/repos/ZhaoPan7/AGV/commits/fd715dc79d52c09560879501868d05adc0d637f1"},{"sha":"7daceaf215c4db4ba544387e8fb758b34607c94c","author":{"email":"9f0b9f67774a67d7fcb0f3b17147067610e0a160@encompass8.cn","name":"zhaopan"},"message":"Merge branch 'master' of https://github.com/ZhaoPan7/AGV\n\n# Conflicts:\n#\tListing/STM32-DEMO.map\n#\tOutput/STM32-DEMO.axf\n#\tOutput/STM32-DEMO.htm\n#\tOutput/STM32-DEMO.tra\n#\tOutput/adc.o\n#\tOutput/agv_pwm.o\n#\tOutput/core_cm3.o\n#\tOutput/led.o\n#\tOutput/main.crf\n#\tOutput/main.o\n#\tOutput/misc.o\n#\tOutput/rc522.o\n#\tOutput/startup_stm32f10x_hd.o\n#\tOutput/stm32f10x_adc.o\n#\tOutput/stm32f10x_bkp.o\n#\tOutput/stm32f10x_dma.o\n#\tOutput/stm32f10x_flash.o\n#\tOutput/stm32f10x_gpio.o\n#\tOutput/stm32f10x_it.crf\n#\tOutput/stm32f10x_it.o\n#\tOutput/stm32f10x_rcc.o\n#\tOutput/stm32f10x_spi.o\n#\tOutput/stm32f10x_tim.o\n#\tOutput/stm32f10x_usart.o\n#\tOutput/system_stm32f10x.o\n#\tOutput/systick.o\n#\tOutput/time_test.o\n#\tOutput/usart1.o\n#\tUSER/STM32-DEMO.uvopt\n#\tUSER/STM32-DEMO_ADC-DEMO.dep\n#\tUSER/STM32-DEMO_uvopt.bak","distinct":true,"url":"https://api.github.com/repos/ZhaoPan7/AGV/commits/7daceaf215c4db4ba544387e8fb758b34607c94c"},{"sha":"306074670d65784b0ec1832f22d3d34fef5f282e","author":{"email":"9f0b9f67774a67d7fcb0f3b17147067610e0a160@encompass8.cn","name":"zhaopan"},"message":"20160125","distinct":true,"url":"https://api.github.com/repos/ZhaoPan7/AGV/commits/306074670d65784b0ec1832f22d3d34fef5f282e"}]}