Derek S. Ray aac78fe62e Fix up errors from mass manual conflict resolution

2015-04-06 17:18:48 -04:00

..

chain

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

gem

Make GOLDOBJ unconditional.

2015-03-17 18:46:23 +02:00

gnome

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

macosx

Fix lost mode bits.

2015-03-17 18:45:40 +02:00

Qt

Remove last mention of EXP_ON_BOTL

2015-03-17 18:46:53 +02:00

share

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

tty

Fix up errors from mass manual conflict resolution

2015-04-06 17:18:48 -04:00

win32

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

X11

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00