diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2006-12-19 16:29:26 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2006-12-19 16:29:26 +0100 |
| commit | 4334860e69e7d5b156082bd05c7a86708e5bad4c (patch) | |
| tree | 380e4abcbfc8950b000ff72b0347e78fee3bc74a /mfb/mfbpixmap.c | |
| parent | 7e4717683d6c08d1e490a60b7493a94bbc57bf8d (diff) | |
| parent | fdcc22ca1704d3519156c66804528c21b04fea65 (diff) | |
Merge branch 'master' into exa-damagetrack
Conflicts:
exa/exa_accel.c
exa/exa_migration.c
Diffstat (limited to 'mfb/mfbpixmap.c')
| -rw-r--r-- | mfb/mfbpixmap.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mfb/mfbpixmap.c b/mfb/mfbpixmap.c index 29dcf3d33..5ec8502cb 100644 --- a/mfb/mfbpixmap.c +++ b/mfb/mfbpixmap.c @@ -44,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbpixmap.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ /* pixmap management written by drewry, september 1986 |