Source Mage code commit list

[George Sherwood <scm AT sourcemage.org>]

GIT changes to stable-rc-0.50 grimoire by George Sherwood 
<gsherwood AT sourcemage.org>:

 graphics-libs/jpeg/CONFLICTS |    1 +
 graphics-libs/jpeg/HISTORY   |    3 +++
 graphics-libs/jpeg/PROVIDES  |    1 +
 3 files changed, 5 insertions(+)

New commits:
commit bb388dff03529cec2269aa3a3c841b77e5cf6d48
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    jpeg provides JPEG and conflicts with libjpeg-turbo
    (cherry picked from commit ca3dbbbffb71307b9edca60617550a6fc569e4d1)

diff --git a/graphics-libs/jpeg/CONFLICTS b/graphics-libs/jpeg/CONFLICTS
new file mode 100755
index 0000000..640fd6a
--- /dev/null
+++ b/graphics-libs/jpeg/CONFLICTS
@@ -0,0 +1 @@
+conflicts libjpeg-turbo
diff --git a/graphics-libs/jpeg/HISTORY b/graphics-libs/jpeg/HISTORY
index 9b98685..3abcf7e 100644
--- a/graphics-libs/jpeg/HISTORY
+++ b/graphics-libs/jpeg/HISTORY
@@ -1,3 +1,6 @@
+2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
+       * CONFLICTS, PROVIDES: added
+
 2010-05-24 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 8b
 
diff --git a/graphics-libs/jpeg/PROVIDES b/graphics-libs/jpeg/PROVIDES
new file mode 100755
index 0000000..fec8ba9
--- /dev/null
+++ b/graphics-libs/jpeg/PROVIDES
@@ -0,0 +1 @@
+JPEG