pixman: Branch 'master'

[Oded Gabbay]

 pixman/pixman-mips-dspr2-asm.S |    2 +-
 pixman/pixman-mips-dspr2-asm.h |    2 +-
 pixman/pixman-mips-dspr2.c     |    2 +-
 pixman/pixman-mips-dspr2.h     |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 744134025609a0a5805c2d3b4d34856eb75cb711
Author: Nemanja Lukic <nemanja.lukic at rt-rk.com>
Date:   Fri Jun 27 18:05:39 2014 +0200

    MIPS: update author's e-mail address
    
    Signed-off-by: Oded Gabbay <oded.gabbay at gmail.com>

diff --git a/pixman/pixman-mips-dspr2-asm.S b/pixman/pixman-mips-dspr2-asm.S
index 866e93e..9dad163 100644
--- a/pixman/pixman-mips-dspr2-asm.S
+++ b/pixman/pixman-mips-dspr2-asm.S
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Author:  Nemanja Lukic (nlukic at mips.com)
+ * Author:  Nemanja Lukic (nemanja.lukic at rt-rk.com)
  */
 
 #include "pixman-private.h"
diff --git a/pixman/pixman-mips-dspr2-asm.h b/pixman/pixman-mips-dspr2-asm.h
index e44edd6..e238566 100644
--- a/pixman/pixman-mips-dspr2-asm.h
+++ b/pixman/pixman-mips-dspr2-asm.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Author:  Nemanja Lukic (nlukic at mips.com)
+ * Author:  Nemanja Lukic (nemanja.lukic at rt-rk.com)
  */
 
 #ifndef PIXMAN_MIPS_DSPR2_ASM_H
diff --git a/pixman/pixman-mips-dspr2.c b/pixman/pixman-mips-dspr2.c
index 122d9dc..87969ae 100644
--- a/pixman/pixman-mips-dspr2.c
+++ b/pixman/pixman-mips-dspr2.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Author:  Nemanja Lukic (nlukic at mips.com)
+ * Author:  Nemanja Lukic (nemanja.lukic at rt-rk.com)
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/pixman/pixman-mips-dspr2.h b/pixman/pixman-mips-dspr2.h
index b9e0684..57b3835 100644
--- a/pixman/pixman-mips-dspr2.h
+++ b/pixman/pixman-mips-dspr2.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Author:  Nemanja Lukic (nlukic at mips.com)
+ * Author:  Nemanja Lukic (nemanja.lukic at rt-rk.com)
  */
 
 #ifndef PIXMAN_MIPS_DSPR2_H