Commits · 74f8a4713a5f514d5e60f9d8b2f3eb03ea18082e · KSHITIJ SINGHA / 173050031-183050016-183050011-git

23 Sep, 2018 6 commits
- merged master with merge-sort · 74f8a471
  KSHITIJ SINGHA authored Sep 23, 2018
  
  74f8a471
- Merge branch 'merge-sort' · ebe6a3b5
  KSHITIJ SINGHA authored Sep 23, 2018
```
Conflicts:
	Makefile
	a.out
	main.cpp
	sorting.cpp
	sorting.h
```
  ebe6a3b5
- add makefile · da949617
  KSHITIJ SINGHA authored Sep 23, 2018
  
  da949617
- add basic implementation · ec370395
  KSHITIJ SINGHA authored Sep 23, 2018
  
  ec370395
- add API and data read · aea92c24
  KSHITIJ SINGHA authored Sep 23, 2018
  
  aea92c24
- changes · 58ca7897
  KSHITIJ SINGHA authored Sep 23, 2018
  
  58ca7897
22 Sep, 2018 9 commits
- changes in test file · ca9c0ac7
  KSHITIJ SINGHA authored Sep 23, 2018
  
  ca9c0ac7
- testfile is added to check merging of two branches · b6926cc4
  KSHITIJ SINGHA authored Sep 23, 2018
  
  b6926cc4
- changed implementation to merge-sort · e75ce9e4
  meethkr authored Sep 23, 2018
  
  e75ce9e4
- change implementation to merge-sort · 40544606
  meethkr authored Sep 23, 2018
  
  40544606
- Makefile have some changes. To use make file simply type 'make all' · 909b5b43
  KSHITIJ SINGHA authored Sep 22, 2018
  
  909b5b43
- changes within the function name of following files, bubblesort() --> sort_custom() · 95d5b83c
  KSHITIJ SINGHA authored Sep 22, 2018
  
  95d5b83c
- add makefile · b1e0aaa8
  KSHITIJ SINGHA authored Sep 22, 2018
  
  b1e0aaa8
- add basic implementation · a5be5362
  KSHITIJ SINGHA authored Sep 22, 2018
  
  a5be5362
- add API and data read · 4988a4fa
  KSHITIJ SINGHA authored Sep 22, 2018
  
  4988a4fa