r2244 - branches/1.2

[des at projects.linpro.no]

Author: des
Date: 2007-11-08 22:34:12 +0100 (Thu, 08 Nov 2007)
New Revision: 2244

Modified:
   branches/1.2/
Log:
Merged revisions 2243 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2243 | des | 2007-11-08 22:33:53 +0100 (Thu, 08 Nov 2007) | 2 lines
  
  Ignore config.cache.
........



Property changes on: branches/1.2
___________________________________________________________________
Name: svn:ignore
   - .deps
Makefile
Makefile.in
aclocal.m4
autom4te.cache
compile
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
configure.lineno
depcomp
install-sh
libtool
ltmain.sh
missing
stamp-h1
varnishapi.pc

   + .deps
Makefile
Makefile.in
aclocal.m4
autom4te.cache
compile
config.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
configure.lineno
depcomp
install-sh
libtool
ltmain.sh
missing
stamp-h1
varnishapi.pc

Name: svnmerge-integrated
   - /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232
   + /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243