19 Apr, 2018

2 commits

• 16962567   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into wwx ... Browse File »

  # Conflicts:
  #	app/libs/processor.jar

  wwx

  2018-04-19 16:27:48 +0800  
• d958596a   no message Browse File »
  姚旭斌

  2018-04-19 13:14:23 +0800  

17 Mar, 2018

1 commit

• c84d485d   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse File »

  # Conflicts:
  #	app/src/main/AndroidManifest.xml

  张道锋

  2018-03-17 17:34:49 +0800  

16 Mar, 2018

4 commits

• b181dda4   no message Browse File »
  陶汉栋

  2018-03-16 13:45:20 +0800  
• a97b79d9   no message Browse File »
  姚旭斌

  2018-03-16 13:42:44 +0800  
• 7143f4b6   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

  2018-03-16 13:29:33 +0800  
• b21e283f   no message Browse File »
  姚旭斌

  2018-03-16 09:07:19 +0800