modified:   iseconfig/master.xreport
	modified:   iseconfig/spibus.projectmgr
	modified:   master_summary.html
	modified:   spibus.gise
Merge branch 'master' of https://github.com/gabe0/spibus

Conflicts:
	iseconfig/master.xreport
	iseconfig/spibus.projectmgr
	master_summary.html
	spibus.gise

	modified:   _xmsgs/pn_parser.xmsgs
	modified:   _xmsgs/xst.xmsgs
	modified:   iseconfig/master.xreport
	modified:   iseconfig/spibus.projectmgr
	modified:   isim/isim_usage_statistics.html
	new file:   isim/temp/glbl.sdb
	new file:   isim/temp/master.sdb
	new file:   isim/temp/top_tb.sdb
	modified:   isim/top_tb_isim_beh.exe.sim/ISimEngine-DesignHierarchy.dbg
	new file:   isim/top_tb_isim_beh.exe.sim/libPortability.dll
	modified:   isim/top_tb_isim_beh.exe.sim/tmp_save/_1
	modified:   isim/top_tb_isim_beh.exe.sim/top_tb_isim_beh.exe
	modified:   isim/top_tb_isim_beh.exe.sim/work/m_00000000002013452923_2073120511.c
	modified:   isim/top_tb_isim_beh.exe.sim/work/m_00000000002013452923_2073120511.didat
	modified:   isim/top_tb_isim_beh.exe.sim/work/m_00000000003309215367_1251139944.c
	modified:   isim/top_tb_isim_beh.exe.sim/work/m_00000000003309215367_1251139944.didat
	modified:   isim/top_tb_isim_beh.exe.sim/work/m_00000000003522183043_3115858369.c
	modified:   isim/top_tb_isim_beh.exe.sim/work/m_00000000003522183043_3115858369.didat
	modified:   isim/work/glbl.sdb
	modified:   isim/work/master.sdb
	modified:   isim/work/top_tb.sdb
	modified:   master.cmd_log
	modified:   master.ngr
	modified:   master.syr
	modified:   master.v
	modified:   master_envsettings.html
	modified:   master_summary.html
	modified:   master_xst.xrpt
	modified:   spibus.gise
	new file:   spibus.ucf
	modified:   spibus.xise
	modified:   top_tb_isim_beh.exe
	modified:   top_tb_isim_beh.wdb
	modified:   webtalk_pn.xml
	modified:   xst/work/hdllib.ref
	modified:   xst/work/vlg48/master.bin
	modified:   _xmsgs/pn_parser.xmsgs
	modified:   iseconfig/master.xreport
	modified:   iseconfig/spibus.projectmgr
	modified:   spibus.gise
Merge branch 'master' of https://github.com/gabe0/spibus

Conflicts:
	_xmsgs/pn_parser.xmsgs
	iseconfig/master.xreport
	iseconfig/spibus.projectmgr
	master_summary.html
	spibus.gise

	deleted:    _xmsgs/ngdbuild.xmsgs
	modified:   _xmsgs/pn_parser.xmsgs
	modified:   _xmsgs/xst.xmsgs
	new file:   iseconfig/.xreport
	modified:   iseconfig/master.xreport
	modified:   iseconfig/spibus.projectmgr
	modified:   isim.cmd
	modified:   isim/isim_usage_statistics.html
	modified:   isim/temp/glbl.sdb
	modified:   isim/temp/master.sdb
	modified:   isim/temp/top_tb.sdb
	modified:   isim/top_tb_isim_beh.exe.sim/ISimEngine-DesignHierarchy.dbg
	modified:   isim/top_tb_isim_beh.exe.sim/tmp_save/_1
	modified:   isim/top_tb_isim_beh.exe.sim/top_tb_isim_beh.exe
	modified:   isim/top_tb_isim_beh.exe.sim/work/m_00000000002013452923_2073120511.didat
	modified:   isim/top_tb_isim_beh.exe.sim/work/m_00000000003309215367_1251139944.c
	modified:   isim/top_tb_isim_beh.exe.sim/work/m_00000000003309215367_1251139944.didat
	modified:   isim/top_tb_isim_beh.exe.sim/work/m_00000000003522183043_3115858369.c
	modified:   isim/top_tb_isim_beh.exe.sim/work/m_00000000003522183043_3115858369.didat
	modified:   isim/work/glbl.sdb
	modified:   isim/work/master.sdb
	modified:   isim/work/top_tb.sdb
	modified:   master.cmd_log
	modified:   master.syr
	modified:   master.v
	modified:   master_envsettings.html
	modified:   master_summary.html
	modified:   master_xst.xrpt
	modified:   spibus.gise
	modified:   spibus.ucf
	modified:   spibus.xise
	modified:   top_tb.v
	modified:   top_tb_isim_beh.wdb
	modified:   webtalk_pn.xml
	modified:   xilinxsim.ini
	modified:   xst/work/hdllib.ref
	modified:   xst/work/vlg48/master.bin