From 417d53e38e84d63dfa2705f41d46ec1df777a8ad Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 19:54:32 +0000
Subject: Merging XORG-CURRENT into trunk

---
 util.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'util.c')

diff --git a/util.c b/util.c
index d408d70..c40cc32 100644
--- a/util.c
+++ b/util.c
@@ -19,7 +19,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86: xc/programs/fonttosfnt/util.c,v 1.11 2003/12/19 02:16:36 dawes Exp $ */
+/* $XdotOrg: xc/programs/fonttosfnt/util.c,v 1.11 2003/12/19 02:16:36 dawes Exp $ */
+/* $XFree86: xc/programs/fonttosfnt/util.c,v 1.10 2003/12/19 02:05:39 dawes Exp $ */
 
 #include <time.h>
 #include <string.h>
-- 
cgit v1.2.3