Changeset 8fb3e24


Ignore:
Timestamp:
03/30/2012 04:52:00 PM (11 years ago)
Author:
Krejzi <krejzi@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, ken/inkscape-core-mods, krejzi/svn, lazarus, nosym, perl-modules, plabs/python-mods, qt5new, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226
Children:
e3dcc43
Parents:
e977805c
Message:

fix conflict that was made with last commit

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9809 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:
1 edited

Legend:

Unmodified
Added
Removed

  • introduction/welcome/changelog.xml

    re977805c r8fb3e24  
    4646      <itemizedlist>
    4747        <listitem>
     48          <para>[abenton] - Added Gtkmm-2.24.2.</para>
     49        </listitem>
     50        <listitem>
    4851          <para>[krejzi] - gobject-introspection 1.32.0.</para>
    49         </listitem>
    50       </itemizedlist>
    51     </listitem>
    52 
    53     <listitem>
    54       <para>March 29th, 2012</para>
    55       <itemizedlist>
    56         <listitem>
    57           <para>[abenton] - Added Gtkmm-2.24.2.</para>
    5852        </listitem>
    5953      </itemizedlist>
Note: See TracChangeset for help on using the changeset viewer.