diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 54112f1a75..10f507b343 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -113,6 +113,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/mac/utils.cpp +<<<<<<< files.bkl + +======= +>>>>>>> 1.74 @@ -181,6 +185,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/zstream.cpp + src/common/bookctrl.cpp src/common/event.cpp src/common/fs_mem.cpp src/common/msgout.cpp