Chuan Chen 7dbf773613 Merge branch 'master' into work ...

Conflicts:
	defs.mak
	scripts/config.log
	scripts/config.status
	scripts/defs.mak

Merged using local version (ours)

2017-08-24 17:51:00 -04:00

..

config.guess

Initial commit at Tue Apr 25 08:41:48 EDT 2017 by tim on stravinsky

2017-04-25 08:41:48 -04:00

config.log

Remote changes at Thu Aug 24 17:24:48 EDT 2017 by chuan on vivaldi

2017-08-24 17:24:48 -04:00

config.status

Remote changes at Thu Aug 24 17:24:48 EDT 2017 by chuan on vivaldi

2017-08-24 17:24:48 -04:00

config.sub

Initial commit at Tue Apr 25 08:41:48 EDT 2017 by tim on stravinsky

2017-04-25 08:41:48 -04:00

configure

Updated configure to add both m4 and python3, then corrected the

2017-08-24 16:51:45 -04:00

configure.in

Updated configure to add both m4 and python3, then corrected the

2017-08-24 16:51:45 -04:00

configure.in.orig

Initial commit at Tue Apr 25 08:41:48 EDT 2017 by tim on stravinsky

2017-04-25 08:41:48 -04:00

defs.mak

Remote changes at Thu Aug 24 17:24:48 EDT 2017 by chuan on vivaldi

2017-08-24 17:24:48 -04:00

defs.mak.in

Initial commit at Tue Apr 25 08:41:48 EDT 2017 by tim on stravinsky

2017-04-25 08:41:48 -04:00

install-sh

Initial commit at Tue Apr 25 08:41:48 EDT 2017 by tim on stravinsky

2017-04-25 08:41:48 -04:00

magic.spec.in

Initial commit at Tue Apr 25 08:41:48 EDT 2017 by tim on stravinsky

2017-04-25 08:41:48 -04:00

makedbh

Initial commit at Tue Apr 25 08:41:48 EDT 2017 by tim on stravinsky

2017-04-25 08:41:48 -04:00

missing

Initial commit at Tue Apr 25 08:41:48 EDT 2017 by tim on stravinsky

2017-04-25 08:41:48 -04:00

mkdirs

Initial commit at Tue Apr 25 08:41:48 EDT 2017 by tim on stravinsky

2017-04-25 08:41:48 -04:00

mkinstalldirs

Initial commit at Tue Apr 25 08:41:48 EDT 2017 by tim on stravinsky

2017-04-25 08:41:48 -04:00

preproc.py

Updated configure to add both m4 and python3, then corrected the

2017-08-24 16:51:45 -04:00

printmans

Initial commit at Tue Apr 25 08:41:48 EDT 2017 by tim on stravinsky

2017-04-25 08:41:48 -04:00