From cabfe8938655e45f0747b39dc48c73c690034720 Mon Sep 17 00:00:00 2001
From: "cantab.net!aia21" <cantab.net!aia21>
Date: Wed, 22 Dec 2004 14:22:58 +0000
Subject: [PATCH] Manual merge

2004/12/22 12:40:19+02:00 (none)!yura
Update.

(Logical change 1.647)
---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 9323d46f..3ac5b40f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -91,6 +91,8 @@ xx/xx/2004 - 2.0.0-WIP
 	- Extend ntfs_attr_pwrite to cope with extending the attribute size
 	  and with instantiating holes.  (Yura)
 	- Add new API's ntfs_rl_sparse and ntfs_rl_get_copmressed_size.  (Yura)
+	- ntfsinfo: Dump flags names for $STANDARD_INFORMATION and $FILE_NAME
+	  attributes.  (Yura)
 	- Move NAttr{Sparse,Compressed,Encrypted} to inode struct preserving
 	  the previous interface.  (Yura, with fixes from Anton)
 	- Rename/move inode.[hc]::ntfs_inode_{add,rm}_attr() to