[Avida-cvs] avida/current/source/main CVS commit

[Kaben Nanlohy]

Update of /cvsroot/avida/avida/current/source/main
In directory sc8-pr-cvs1:/tmp/cvs-serv13773/main

Modified Files:
      Tag: kaben
	inst_lib.hh primitive.ncb primitive.pch primitive.pdb 
	primitive.suo primitive.vcproj 
Removed Files:
      Tag: kaben
	inst_lib.cc 
Log Message:

Fix partial merges, add files to VS.net projects, remove unused source.
- Still encountering merge conflicts in trio files; cvs not recognizing
  rcs keywords.  Not sure how to fix this.
- Removed source/main/inst_lib.cc from VS.net projects, as it's no
  longer used, and added source/main/inst_set.* and
  source/cpu/hardware_4stack.*.