[coot/f14/master: 6/6] - update to SVN 3442 (should resolve guile-gtk dependency issues)

[Timothy Fenn]

commit 96c87d3202d0a390b29157ff485faad90d202656
Merge: 9afdd68 ebc70ff
Author: Tim Fenn <fenn at stanford.edu>
Date:   Tue Mar 29 13:24:35 2011 -0700

    - update to SVN 3442 (should resolve guile-gtk dependency issues)
    
    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	coot-configure.in.patch
    	coot-user-manual.texi.patch
    	coot.spec
    	sources

 .gitignore                  |    2 ++
 coot-configure.in.patch     |    8 ++++----
 coot-user-manual.texi.patch |    8 ++++----
 coot.spec                   |   18 +++++++++++++-----
 sources                     |    2 +-
 5 files changed, 24 insertions(+), 14 deletions(-)
---