Merge branch 'master' into autotools-conversion

This commit is contained in:
Jon Trulson
2020-11-24 16:53:24 -07:00
56 changed files with 307 additions and 186 deletions

View File

@@ -125,8 +125,6 @@ static void InitializeBW(
/*+++++++++++++++++++++++++++++++++++++++*/
/* Internal Variables */
/*+++++++++++++++++++++++++++++++++++++++*/
int NumOfPalettes = 0;
static char *PALETTE_DIR = CDE_INSTALLATION_TOP "/palettes/";
static char *PALETTE_DIR_ADM = "/etc/dt/palettes/";
static char *DEFAULT_FILENAME = "palette.dt";

View File

@@ -246,7 +246,7 @@ Widget paletteList;
Widget deleteButton;
char *defaultName;
Bool WaitSelection;
int NumOfPalettes;
int NumOfPalettes = 0;
/*+++++++++++++++++++++++++++++++++++++++*/
/* Internal Variables */