modified:   src/cuda-sim/tags
	modified:   src/tags
	modified:   tags
Merge branch 'master' of https://github.com/SteveXiSong/gpgpu-sim-approximate

Conflicts:
	src/tags