← Back to branch summary

~dickelbeck/kicad/merge-1

« back to all changes in this revision

Viewing changes to include/common.h

  • Committer: Andrey Fedorushkov
  • Date: 2010-07-13 13:18:13 UTC
  • Revision ID: andrf@mail.ru-20100713131813-zzy2lv24r6nxvtgp
fix conflict variable name for russian GOST

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/common.h
84
84
};
85
85
 
86
86
#if defined(KICAD_GOST)
87
 
#define LEFTMARGIN   800    /* 20mm */
88
 
#define RIGHTMARGIN  200    /* 5mm */
89
 
#define TOPMARGIN    200    /* 5mm */
90
 
#define BOTTOMMARGIN 200    /* 5mm */
 
87
#define GOST_LEFTMARGIN   800    /* 20mm */
 
88
#define GOST_RIGHTMARGIN  200    /* 5mm */
 
89
#define GOST_TOPMARGIN    200    /* 5mm */
 
90
#define GOST_BOTTOMMARGIN 200    /* 5mm */
91
91
 
92
92
#endif
93
93
/* forward declarations: */