Merging XORG-CURRENT into trunk

This commit is contained in:
Egbert Eich 2004-04-23 19:54:30 +00:00
commit 2fb5886200
1188 changed files with 20614 additions and 3558 deletions

View file

@ -133,6 +133,14 @@ typedef enum {
xpoid_val_medium_size_jis_b8,
xpoid_val_medium_size_jis_b9,
xpoid_val_medium_size_jis_b10,
xpoid_val_medium_size_hp_2x_postcard,
xpoid_val_medium_size_hp_european_edp,
xpoid_val_medium_size_hp_mini,
xpoid_val_medium_size_hp_postcard,
xpoid_val_medium_size_hp_tabloid,
xpoid_val_medium_size_hp_us_edp,
xpoid_val_medium_size_hp_us_government_legal,
xpoid_val_medium_size_hp_us_government_letter,
xpoid_val_plex_simplex,
xpoid_val_plex_duplex,
xpoid_val_plex_tumble,