sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 79735 by Eric Sandall for review

From: Perforce Review Daemon <p4review AT smee.org>
To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 79735 by Eric Sandall for review
Date: Tue, 23 May 2006 21:40:01 +0100 (BST)

Change 79735 by eric_sandall@sandalle-moby on 2006/05/23 21:36:26

* Misread the error, sorry. ;/

Affected files ...

... //sgl/grimoires/xorg-modular/xorg-app/mkfontdir/CONFLICTS#2 delete
... //sgl/grimoires/xorg-modular/xorg-app/mkfontdir/HISTORY#9 edit
... //sgl/grimoires/xorg-modular/xorg-app/mkfontscale/CONFLICTS#2 delete
... //sgl/grimoires/xorg-modular/xorg-app/mkfontscale/HISTORY#9 edit

Differences ...

==== //sgl/grimoires/xorg-modular/xorg-app/mkfontdir/HISTORY#9 (text) ====

@@ -1,6 +1,3 @@
-2006-05-23 Eric Sandall <eric AT sandall.us>
- * CONFLICTS: Conflicts with xorg, xfree86, and xdirectfb
-
2006-05-23 AndraÅ¾ "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated for xorg 7.1

==== //sgl/grimoires/xorg-modular/xorg-app/mkfontscale/HISTORY#9 (text) ====

@@ -1,6 +1,3 @@
-2006-05-23 Eric Sandall <eric AT sandall.us>
- * CONFLICTS: Conflicts with xorg, xfree86, and xdirectfb
-
2005-12-22 Robin Cook <rcook AT wyrms.net>
* DETAILS: Updated VERSION to 1.0.1
added XORG_VER

[SM-Commit] PERFORCE change 79735 by Eric Sandall for review, Perforce Review Daemon, 05/23/2006