7aebad285d
Corrected the configure.in and defs.mak.in file so that the
...
python3 preprocessor is captured in the variable MCPP, not CPP,
since CPP is meaningful to the make process. Also, the
MAGICDIR variable in the name needed to be escaped so that the
variable is not evaluated within the configure script.
2017-08-25 14:13:30 -04:00
87aaa13bfd
Merge branch 'master' into work
2017-08-25 12:47:41 -04:00
42e41555d9
Update at Fri Aug 25 12:47:39 EDT 2017 by chuan
2017-08-25 12:47:39 -04:00
72854afb8f
Remote changes at Thu Aug 24 17:52:02 EDT 2017 by chuan on vivaldi
2017-08-24 17:52:02 -04:00
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
e4b6825b95
Remote changes at Thu Aug 24 17:50:54 EDT 2017 by chuan on vivaldi
2017-08-24 17:50:54 -04:00
77da51d416
Remote changes at Thu Aug 24 17:24:48 EDT 2017 by chuan on vivaldi
2017-08-24 17:24:48 -04:00
8a334aa861
Didn't make clean before git push; these files should be in the
...
gitignore file. . .
2017-08-24 16:52:46 -04:00
a55adf128f
Updated configure to add both m4 and python3, then corrected the
...
python preprocessor script to execute "env python3" instead of
the hard-coded non-existent directory that was on the shebang
line.
2017-08-24 16:51:45 -04:00
9de99f8e1c
Merge branch 'work' into tomerge
2017-08-24 16:47:28 -04:00
2261799137
Update at Thu Aug 24 16:47:27 EDT 2017 by tim
2017-08-24 16:47:27 -04:00
0704882ac2
Changes that should have been ignored by .gitignore.
2017-08-23 16:00:39 -04:00
38dfe61dbb
Corrected .gitignore to ignore files from configuration (defs.mak,
...
config.log, etc.). Not sure that is working properly with gitocd
since "defs.mak" was already in the .gitignore file but it queued
for commit.
2017-08-23 13:55:40 -04:00
ae3b76dfd6
Update at Wed Aug 23 07:27:58 EDT 2017 by tim
2017-08-23 07:27:58 -04:00
87a88be5d6
Remote changes at Fri Aug 18 14:42:55 EDT 2017 by chuan on vivaldi
2017-08-18 14:42:55 -04:00
78dd126686
Merge branch 'master' into work
2017-08-18 14:15:15 -04:00
902ae0c7d4
Remote changes at Fri Aug 18 14:15:12 EDT 2017 by chuan on vivaldi
2017-08-18 14:15:12 -04:00
f739da5e10
Update at Fri Aug 18 14:15:11 EDT 2017 by chuan
2017-08-18 14:15:11 -04:00
17e387bfa2
Remote changes at Thu Aug 17 15:42:31 EDT 2017 by chuan on vivaldi
2017-08-17 15:42:31 -04:00
40d9a5a9c8
Merge branch 'master' into work
2017-08-17 13:47:40 -04:00
cb55befc20
Remote changes at Thu Aug 17 13:47:38 EDT 2017 by chuan on vivaldi
2017-08-17 13:47:38 -04:00
d21ae209c9
Update at Thu Aug 17 13:47:37 EDT 2017 by chuan
2017-08-17 13:47:37 -04:00
1ad0d77537
Remote changes at Wed Aug 16 14:11:12 EDT 2017 by chuan on vivaldi
2017-08-16 14:11:12 -04:00
f44e246c24
Merge branch 'master' into work
2017-08-16 13:52:33 -04:00
cebebcccc8
Remote changes at Wed Aug 16 13:52:31 EDT 2017 by chuan on vivaldi
2017-08-16 13:52:31 -04:00
9159acf9f3
Update at Wed Aug 16 13:52:31 EDT 2017 by chuan
2017-08-16 13:52:31 -04:00
4c4a096330
Merge branch 'master' into work
2017-08-15 15:19:15 -04:00
72f9a2a1ab
Remote changes at Tue Aug 15 15:19:13 EDT 2017 by chuan on vivaldi
2017-08-15 15:19:13 -04:00
8b3ea6349c
Update at Tue Aug 15 14:53:25 EDT 2017 by tim
2017-08-15 14:53:25 -04:00
60f5342ddc
Update at Mon Aug 14 16:07:11 EDT 2017 by tim
2017-08-14 16:07:11 -04:00
ad6cbe2e2f
Remote changes at Fri Aug 11 15:42:32 EDT 2017 by chuan on vivaldi
2017-08-11 15:42:32 -04:00
2f5128f50a
Merge branch 'master' into work
2017-08-11 15:18:34 -04:00
9e183c63f4
Remote changes at Fri Aug 11 15:18:32 EDT 2017 by chuan on vivaldi
2017-08-11 15:18:32 -04:00
c80fd29c80
Update at Fri Aug 11 15:18:31 EDT 2017 by chuan
2017-08-11 15:18:31 -04:00
2fd19426d9
Remote changes at Thu Aug 10 14:28:06 EDT 2017 by chuan on vivaldi
2017-08-10 14:28:06 -04:00
f381668d21
Merge branch 'master' into work
2017-08-10 14:27:53 -04:00
0da80741da
Remote changes at Thu Aug 10 14:27:50 EDT 2017 by chuan on vivaldi
2017-08-10 14:27:50 -04:00
a1d33501f3
Update at Thu Aug 10 14:27:50 EDT 2017 by chuan
2017-08-10 14:27:50 -04:00
cc246bec6e
Merge branch 'master' into work
2017-08-09 14:55:34 -04:00
6e8274ab5c
Remote changes at Wed Aug 9 14:55:30 EDT 2017 by chuan on vivaldi
2017-08-09 14:55:30 -04:00
276d81a8ca
Update at Wed Aug 9 09:04:45 EDT 2017 by tim
2017-08-09 09:04:45 -04:00
fd38b0adcf
Merge branch 'master' into work
2017-08-08 15:00:21 -04:00
660d41a69b
Remote changes at Tue Aug 8 15:00:19 EDT 2017 by chuan on vivaldi
2017-08-08 15:00:19 -04:00
cc9e52a922
Update at Tue Aug 8 14:15:26 EDT 2017 by tim
2017-08-08 14:15:26 -04:00
d905f10595
Remote changes at Mon Aug 7 16:22:11 EDT 2017 by chuan on vivaldi
2017-08-07 16:22:11 -04:00
a90545be3f
Remote changes at Mon Aug 7 15:37:14 EDT 2017 by chuan on vivaldi
2017-08-07 15:37:14 -04:00
31ac164be4
Remote changes at Mon Aug 7 14:38:50 EDT 2017 by chuan on vivaldi
2017-08-07 14:38:50 -04:00
cc790050e3
Merge branch 'master' into work
2017-08-07 14:19:40 -04:00
1e06727a72
Update at Mon Aug 7 14:17:23 EDT 2017 by chuan
2017-08-07 14:17:23 -04:00
9bd159f1c8
Remote changes at Mon Aug 7 14:17:12 EDT 2017 by chuan on vivaldi
2017-08-07 14:17:12 -04:00
Tim Edwards
Chuan Chen
Tim Edwards