[122321] users/devans/GNOME-3/unstable/dports/gnome/at-spi2-atk

[devans at macports.org]

Revision: 122321
          https://trac.macports.org/changeset/122321
Author:   devans at macports.org
Date:     2014-07-20 15:22:42 -0700 (Sun, 20 Jul 2014)
Log Message:
-----------
GNOME-3/unstable: at-spi2-atk, merge sync with trunk.

Modified Paths:
--------------
    users/devans/GNOME-3/unstable/dports/gnome/at-spi2-atk/Portfile

Property Changed:
----------------
    users/devans/GNOME-3/unstable/dports/gnome/at-spi2-atk/


Property changes on: users/devans/GNOME-3/unstable/dports/gnome/at-spi2-atk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/at-spi2-atk:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/rmstonecipher/gnome/at-spi2-atk:102363-103172
   + /branches/mld-qt-481/dports/gnome/at-spi2-atk:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/at-spi2-atk:119550-122320
/users/rmstonecipher/gnome/at-spi2-atk:102363-103172

Modified: users/devans/GNOME-3/unstable/dports/gnome/at-spi2-atk/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/at-spi2-atk/Portfile	2014-07-20 22:19:08 UTC (rev 122320)
+++ users/devans/GNOME-3/unstable/dports/gnome/at-spi2-atk/Portfile	2014-07-20 22:22:42 UTC (rev 122321)
@@ -9,7 +9,6 @@
 checksums           rmd160  f9ad7db8c8ef360bfc2ee5622adc5b36fd9db4a9 \
                     sha256  b20ede423cdf95ae34feca08b1f01afccafd75c37a3c8060b04beed31b18af15
 
-conflicts           at-spi
 license             LGPL
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         Gnome Accesibility Technology Service
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140720/0249811b/attachment.html>