|
Last change
on this file since 16583 was 16583, checked in by davidb, 16 years ago |
|
Undoing change commited in r16582
|
-
Property svn:executable
set to
*
-
Property svn:keywords
set to
Author Date Id Revision
|
|
File size:
1.1 KB
|
| Line | |
|---|
| 1 | /**************************************************************************
|
|---|
| 2 | *
|
|---|
| 3 | * mgmerge.h --- mgmerge #defines, etc
|
|---|
| 4 | * Copyright (C) 1995 Shane Hudson ([email protected])
|
|---|
| 5 | *
|
|---|
| 6 | * This program is free software; you can redistribute it and/or modify
|
|---|
| 7 | * it under the terms of the GNU General Public License as published by
|
|---|
| 8 | * the Free Software Foundation; either version 2 of the License, or
|
|---|
| 9 | * (at your option) any later version.
|
|---|
| 10 | *
|
|---|
| 11 | * This program is distributed in the hope that it will be useful,
|
|---|
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|---|
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|---|
| 14 | * GNU General Public License for more details.
|
|---|
| 15 | *
|
|---|
| 16 | * You should have received a copy of the GNU General Public License
|
|---|
| 17 | * along with this program; if not, write to the Free Software
|
|---|
| 18 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|---|
| 19 | *
|
|---|
| 20 | * $Id: mg_merge.h 16583 2008-07-29 10:20:36Z davidb $
|
|---|
| 21 | * Last edtited: November 12 1994
|
|---|
| 22 | *
|
|---|
| 23 | **************************************************************************/
|
|---|
| 24 |
|
|---|
| 25 | #ifndef MGMERGE_H
|
|---|
| 26 | #define MGMERGE_H
|
|---|
| 27 |
|
|---|
| 28 | typedef unsigned char byte;
|
|---|
| 29 |
|
|---|
| 30 | #define OLD 0
|
|---|
| 31 | #define NEW 1
|
|---|
| 32 | #define MERGE 2
|
|---|
| 33 |
|
|---|
| 34 | #define OK 0
|
|---|
| 35 | #define ERROR_MGMERGE 1
|
|---|
| 36 |
|
|---|
| 37 | #endif
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
