root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corretto conflitto precedente

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@186 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
nik 1994-09-08 10:19:09 +00:00
parent c4c3f7bae3
commit d846d8490f
5 changed files with 1058 additions and 1064 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cg/cg4400.h
View File

@ -24,12 +24,6 @@
#include "cglib03.h" #include "cglib03.h"
<<<<<<< cg4400.h
const int MAXSTR = 255;
static char __tmp[MAXSTR];
=======
>>>>>>> 1.6
//enum STAMPA { bollati=1, unici=2 }; //enum STAMPA { bollati=1, unici=2 };
const int TABREG = (int)TTable::name2log("REG"); const int TABREG = (int)TTable::name2log("REG");