New commits:
commit 25ef317010af520ee40f5cc9d70d86bf95b8a1aa
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
fixed merge
diff --git a/ChangeLog b/ChangeLog
index 576eaa9..99abacf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -317,12 +317,9 @@
2013-09-27 Vlad Glagolev <stealth AT sourcemage.org>
* video/mpv: new spell, free and open-source general-purpose video
player
-<<<<<<< HEAD
2013-09-22 Pol Vinogradov <vin.public AT gmail.com>
* xorg-driver/glamor: new spell, 2D acceleration driver for X Window
System
-=======
->>>>>>> master
2013-09-22 Treeve Jelbert <treeve AT sourcemage.org>
* python-pypi/kinterbasdb: spell deprecated [replaced by fdb]
* devel/qxorm: new spell, ORM library for Qt/Boost
@@ -1139,13 +1136,10 @@
your environment
* perl-cpan/xml-sax-base: new spell, base class SAX Drivers and
Filters
-<<<<<<< HEAD
2012-09-01 Pol Vinogradov <vin.public AT gmail.com>
* graphics-libs/glu: new spell, the OpenGL Utility Library (GLU)
is a computer graphics library for OpenGL separated from mesa
-=======
->>>>>>> master
2012-09-01 Treeve Jelbert <treeve AT sourcemage.org>
* qt5: new section
* qt5/qtxmlpatterns: new spell
[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (25ef317010af520ee40f5cc9d70d86bf95b8a1aa),
Vlad Glagolev, 04/17/2014