diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:32 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:32 +0000 |
| commit | 417d53e38e84d63dfa2705f41d46ec1df777a8ad (patch) | |
| tree | b237bf3bfd6d3403124ea05e9605f07896bf3d9e /util.c | |
| parent | 3d00e4afa32385f6926fcd61dfa071f263a773a3 (diff) | |
Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE
Diffstat (limited to 'util.c')
| -rw-r--r-- | util.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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> |