21 Jun, 2016

38 commits

• 432634423   Merge branch 'master' of http://gitlab.sanlien.com.tw/tom/git_test ... Browse Code »

  # Conflicts:
  #	changeLog.txt

  Jeff Chen

  2016-06-21 12:29:01 +0800  
• 2cc805ef8   Merge branch 'master' of http://gitlab.sanlien.com.tw/tom/git_test ... Browse Code »

  # Conflicts:
  #	changeLog.txt
  #	newFile.txt

  Jeff Chen

  2016-06-21 12:27:12 +0800  
• 12cac066e   Merge branch 'master' of http://gitlab.sanlien.com.tw/tom/git_test ... Browse Code »

  Conflicts:
  	changeLog.txt
  	licence.txt

  tom200e

  2016-06-21 12:24:27 +0800  
• 20187f672   first file ... Browse Code »

  Signed-off-by: tom200e <tom200e@hotmail.com>

  tom200e

  2016-06-21 12:22:59 +0800  
• aaa287d94   NN Browse Code »
  Jeff Chen

  2016-06-21 12:07:41 +0800  
• 7aaf34d78   VV Browse Code »
  Jeff Chen

  2016-06-21 12:07:16 +0800  
• 170b5319e   Merge branch 'master' of http://gitlab.sanlien.com.tw/tom/git_test Browse Code »
  Ting Chan

  2016-06-21 11:22:54 +0800  
• bcca4eb6b   newFile Browse Code »
  Ting Chan

  2016-06-21 11:22:15 +0800  
• a02690e7c   Merge branch 'master' of http://gitlab.sanlien.com.tw/tom/git_test into sanlien_a Browse Code »
  Frank Wang

  2016-06-21 11:22:02 +0800  
• 39bc33676   Merge remote-tracking branch 'remotes/origin/sanlien_a' ... Browse Code »

  Conflicts:
  	sanlien_hihi.txt

  tom200e

  2016-06-21 11:19:37 +0800  
• 74ad6c1c2   <由 Git 自動產生> form tom 2016-06-21 Browse Code »
  tom200e

  2016-06-21 11:16:49 +0800  
• cdee61ad9   Merge remote-tracking branch 'remotes/origin/Branch_master' Browse Code »
  tom200e

  2016-06-21 11:15:48 +0800  
• ac25e4300   Merge branch 'test_ting' of http://gitlab.sanlien.com.tw/tom/git_test into sanlien_a Browse Code »
  Frank Wang

  2016-06-21 11:14:39 +0800  
• da91590d5   aaa Browse Code »
  tom200e

  2016-06-21 11:10:10 +0800  
• fa4ff7034   Merge branch 'Branch_master' of http://gitlab.sanlien.com.tw/tom/git_test into Branch_master2 Browse Code »
  Jeff Chen

  2016-06-21 11:09:12 +0800  
• 078af843b   V004 Browse Code »
  Jeff Chen

  2016-06-21 10:56:49 +0800  
• 0c06d868b   V001 Browse Code »
  Jeff Chen

  2016-06-21 10:51:45 +0800  
• c6348e5f2   20160621 frank Browse Code »
  Frank Wang

  2016-06-21 10:48:36 +0800  
• f8490e065   2016/06/21 ... Browse Code »

  Adding main()

  ching

  2016-06-21 10:47:15 +0800  
• 195fd77e0   change Browse Code »
  Ting Chan

  2016-06-21 10:45:46 +0800  
• ef3dae9f5   three Browse Code »
  tom200e

  2016-06-21 10:34:45 +0800  
• 96a13fa43   second Browse Code »
  tom200e

  2016-06-21 10:32:21 +0800  
• 774ffa700   Merge branch 'master' of http://gitlab.sanlien.com.tw/tom/git_test Browse Code »
  tom200e

  2016-06-21 10:31:14 +0800  
• d4357dab5   information Browse Code »
  tom200e

  2016-06-21 10:30:55 +0800  
• faae624a9   Merge branch 'master' of http://gitlab.sanlien.com.tw/tom/git_test Browse Code »
  Ting Chan

  2016-06-21 10:27:25 +0800  
• ccb1c3b9a   changeLog - ting Browse Code »
  Ting Chan

  2016-06-21 10:26:26 +0800  
• 7d52e491e   Merge branch 'master' of http://gitlab.sanlien.com.tw/tom/git_test Browse Code »
  Frank Wang

  2016-06-21 10:24:50 +0800  
• 334a45aa4   aaa Browse Code »
  Frank Wang

  2016-06-21 10:24:08 +0800  
• ee7da4093   V Browse Code »
  Jeff Chen

  2016-06-21 10:21:56 +0800  
• 8dcfcacaf   V001 Browse Code »
  Jeff Chen

  2016-06-21 10:20:40 +0800  
• a0b64b771   ting add file Browse Code »
  Ting Chan

  2016-06-21 10:16:46 +0800  
• bbd186465   aa Browse Code »
  johnn_yang

  2016-06-21 10:14:40 +0800  
• a59d8cf92   Merge branch 'master' of http://gitlab.sanlien.com.tw/tom/git_test Browse Code »
  johnn_yang

  2016-06-21 10:13:41 +0800  
• 805d17586   Hi Browse Code »
  johnn_yang

  2016-06-21 10:12:55 +0800  
• 9469c7331   ting add README Browse Code »
  Ting Chan

  2016-06-21 10:09:28 +0800  
• cd17b2c11   Merge branch 'master' of http://gitlab.sanlien.com.tw/tom/git_test Browse Code »
  tom200e

  2016-06-21 10:01:54 +0800  
• eed3c9f67   first file ... Browse Code »

  Signed-off-by: tom200e <tom200e@hotmail.com>

  tom200e

  2016-06-21 09:59:48 +0800  
• 350de5c76   first commit Browse Code »
  tom200e

  2016-06-21 09:42:15 +0800