D-93(m)

v-4.0
---
1. use HI-TECH C

         ==> W
D-93

J/C
Merge branch 'master' into D-93_PIC16_F88_first

Conflicts:
	D-90~/D-93_PIC16_F88_A-D-conv/D-93_PIC16_F88_A-D-conv_v-4.0/D-93_PIC16_F88_A-D-conv_v-4.0.mcp
	D-90~/D-93_PIC16_F88_A-D-conv/D-93_PIC16_F88_A-D-conv_v-4.0/D-93_PIC16_F88_A-D-conv_v-4.0.mcs
D-93(m)

J/C

MPLAB: mcw changed
Merge branch 'master' into D-93_PIC16_F88_first
D-93

J/C

msc changed
D-93

v-3.1a
---
1. new project: mikroC

	==> n/w
D-93(m)

v-4.1.0
---
1. coding as is

         ==> W
D-93

J/C
---
1. workspace --> changed
Merge branch 'master' into D-93_PIC16_F88_first
D-93(m)

v-4.1.1
---
1. LED => on/off

         ==> W
Merging...
D-93(m)

v-5.0
---
D-93(m)

v-5.1.2a
---
1. Merging => trouble shooting...
D-93(m)

v-5.1.2
---
1. as in REF --> http://homepage3.nifty.com/mitt/pic/pic5_16_1.html
2. fast switching

	==> W
Merge branch 'master' into D-93_PIC16_F88_first

Conflicts:
	D-90~/D-93_PIC16_F88_A-D-conv/D-93_PIC16_F88_AD-conv_v-5.0/D-93_PIC16_F88_AD-conv_v-5.0.asm
	D-90~/D-93_PIC16_F88_A-D-conv/D-93_PIC16_F88_AD-conv_v-5.0/D-93_PIC16_F88_AD-conv_v-5.0.err
	D-90~/D-93_PIC16_F88_A-D-conv/D-93_PIC16_F88_AD-conv_v-5.0/D-93_PIC16_F88_AD-conv_v-5.0.map
	D-90~/D-93_PIC16_F88_A-D-conv/D-93_PIC16_F88_AD-conv_v-5.0/D-93_PIC16_F88_AD-conv_v-5.0.mcw
Merge https://github.com/iwabuchiken/Embedded

Conflicts:
	D-90~/D-93_PIC16_F88_A-D-conv/D-93_PIC16_F88_A-D-conv_v-2.0/D-93_PIC16_F88_A-D-conv_v-2.0.mcw
	D-90~/D-93_PIC16_F88_A-D-conv/D-93_PIC16_F88_A-D-conv_v-3.0/D-93_PIC16_F88_A-D-conv_v-3.0.c