home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Amiga MA Magazine 1998 #6
/
amigamamagazinepolishissue1998.iso
/
www
/
alfw
/
chat
/
mergewindow.gif
< prev
next >
Graphics Interchange Format
|
1997-11-07
|
10KB
|
804x468
|
4-bit (10 colors)
Labels:
text
|
screenshot
|
display
|
software
|
number
|
computer icon
|
multimedia software
OCR:
Merge window YOUR VERSION: PARENT WORKSPACE's VERSION: #include <stdio.h> #include <stdio.h> void main(void) void main(void) printf("CHAT-X is fantastic\n"); printf("CHAT-X is great\n"); MERGED VERSION (diff2) : #include <stdio.h> void main(void) T IFDEF #change printf("CHAT-X is fantastic\n"); END IFDEF #change ELSE #change printf("CHAT-X is great\n"); END ELSE #change Finished with merging the files!