Author: des
Date: 2007-12-18 18:04:37 +0100 (Tue, 18 Dec 2007)
New Revision: 2304
Modified:
branches/1.1/
branches/1.1/doc/Makefile.am
Log:
Merged revisions 2298 via svnmerge from
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache
........
r2298 | des | 2007-12-18 17:50:26 +0100 (Tue, 18 Dec 2007) | 3 lines
Order change logs in reverse chronological order to make it easier to add
new ones.
........
Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
- /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206,2211-2212,2215-2220,2222-2232,2243,2270-2271,2275
+ /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206,2211-2212,2215-2220,2222-2232,2243,2270-2271,2275,2298
Modified: branches/1.1/doc/Makefile.am
===================================================================
--- branches/1.1/doc/Makefile.am 2007-12-18 17:02:39 UTC (rev 2303)
+++ branches/1.1/doc/Makefile.am 2007-12-18 17:04:37 UTC (rev 2304)
@@ -1,14 +1,14 @@
# $Id$
CHANGELOGS = \
- changes-1.0.4.html \
+ changes-1.1.1.html \
changes-1.1.html \
- changes-1.1.1.html
+ changes-1.0.4.html
XML = \
+ changes-1.1-1.1.1.xml \
+ changes-1.0.4-1.1.xml \
changes-1.0.3-1.0.4.xml \
- changes-1.0.4-1.1.xml \
- changes-1.1-1.1.1.xml \
${CHANGELOGS:.html=.xml}
all: ${CHANGELOGS}
Date: 2007-12-18 18:04:37 +0100 (Tue, 18 Dec 2007)
New Revision: 2304
Modified:
branches/1.1/
branches/1.1/doc/Makefile.am
Log:
Merged revisions 2298 via svnmerge from
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache
........
r2298 | des | 2007-12-18 17:50:26 +0100 (Tue, 18 Dec 2007) | 3 lines
Order change logs in reverse chronological order to make it easier to add
new ones.
........
Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
- /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206,2211-2212,2215-2220,2222-2232,2243,2270-2271,2275
+ /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206,2211-2212,2215-2220,2222-2232,2243,2270-2271,2275,2298
Modified: branches/1.1/doc/Makefile.am
===================================================================
--- branches/1.1/doc/Makefile.am 2007-12-18 17:02:39 UTC (rev 2303)
+++ branches/1.1/doc/Makefile.am 2007-12-18 17:04:37 UTC (rev 2304)
@@ -1,14 +1,14 @@
# $Id$
CHANGELOGS = \
- changes-1.0.4.html \
+ changes-1.1.1.html \
changes-1.1.html \
- changes-1.1.1.html
+ changes-1.0.4.html
XML = \
+ changes-1.1-1.1.1.xml \
+ changes-1.0.4-1.1.xml \
changes-1.0.3-1.0.4.xml \
- changes-1.0.4-1.1.xml \
- changes-1.1-1.1.1.xml \
${CHANGELOGS:.html=.xml}
all: ${CHANGELOGS}