summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-05-04 16:53:47 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-05-04 16:53:47 +0200
commit28d683480c3acf5a8b02e302b43184a71b00694a (patch)
treeb54dcb9418e4f587a5faeb4edd4d9bfefe07d4a1
parent495e11fe13f33971a814d12336319ab7c3e486e4 (diff)
parenta597d9187fe2d0e9d2b3c7e411cd422ef6a4f16d (diff)
downloadxine-lib-28d683480c3acf5a8b02e302b43184a71b00694a.tar.gz
xine-lib-28d683480c3acf5a8b02e302b43184a71b00694a.tar.bz2
Merge - part 2.
-rw-r--r--src/xine-utils/attributes.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/xine-utils/attributes.h b/src/xine-utils/attributes.h
index 80bcadd7f..280fd3685 100644
--- a/src/xine-utils/attributes.h
+++ b/src/xine-utils/attributes.h
@@ -1,8 +1,10 @@
/*
* attributes.h
* Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
+ * Copyright (C) 2001-2007 xine developers
*
- * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
+ * This file was originally part of mpeg2dec, a free MPEG-2 video stream
+ * decoder.
*
* mpeg2dec is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by