diff options
author | Avneesh Saluja <asaluja@gmail.com> | 2013-03-28 18:28:16 -0700 |
---|---|---|
committer | Avneesh Saluja <asaluja@gmail.com> | 2013-03-28 18:28:16 -0700 |
commit | 5b8253e0e1f1393a509fb9975ba8c1347af758ed (patch) | |
tree | 1790470b1d07a0b4973ebce19192e896566ea60b /jam-files/engine/patchlevel.h | |
parent | 2389a5a8a43dda87c355579838559515b0428421 (diff) | |
parent | b203f8c5dc8cff1b9c9c2073832b248fcad0765a (diff) |
fixed conflicts
Diffstat (limited to 'jam-files/engine/patchlevel.h')
-rw-r--r-- | jam-files/engine/patchlevel.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/jam-files/engine/patchlevel.h b/jam-files/engine/patchlevel.h deleted file mode 100644 index 699efd84..00000000 --- a/jam-files/engine/patchlevel.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 1993-2002 Christopher Seiwald and Perforce Software, Inc. - * - * This file is part of Jam - see jam.c for Copyright information. - */ - -/* Keep JAMVERSYM in sync with VERSION. */ -/* It can be accessed as $(JAMVERSION) in the Jamfile. */ - -#define VERSION_MAJOR 2011 -#define VERSION_MINOR 04 -#define VERSION_PATCH 0 -#define VERSION_MAJOR_SYM "2011" -#define VERSION_MINOR_SYM "04" -#define VERSION_PATCH_SYM "00" -#define VERSION "2011.4" -#define JAMVERSYM "JAMVERSION=2011.4" |