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@76 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 1994-08-26 16:10:19 +00:00
parent 163625d934
commit 55ba45f43a
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cg/cg4500.cpp
View File

@ -572,15 +572,4 @@ int cg4500 (int argc, char* argv[])
main_app.run(argc, argv, "");
return TRUE;
}
<<<<<<< cg4500.cpp
=======
>>>>>>> 1.4