@@ -32,8 +32,14 @@
- FIXME: old style hook messages are not implemented (except FILEOKSTRING)
+<<<<<<< filedlg.c
- FIXME: if the size of lpstrFile (nMaxFile) is too small the first
- two bytes of lpstrFile should contain the needed size
+=======
- FIXME: lpstrCustomFilter not handled
+>>>>>>> 1.78
- FIXME: algorithm for selecting the initial directory is too simple
Hmmm, this looks like you had some merging issues with CVS :-)
Lionel