merge trunk from 19853 to 19947

svn: r19949
This commit is contained in:
Benny Malengier
2012-07-05 00:38:18 +00:00
360 changed files with 9231 additions and 4315 deletions
configure.in
po
src
Makefile.amUtils.py
cli
data
gen
gramps.py
gui
guiQML
plugins
Makefile.ambookreport.gpr.pybookreport.py
docgen
drawreport
export
gramplet
graph
import
lib
quickview
records.gpr.pyrecords.py
textreport
tool
view
webreport
webstuff
test
webapp

@ -51,7 +51,6 @@ from gi.repository import Gtk
# Gramps Modules
#
#-------------------------------------------------------------------------
import const
import cairo
#-------------------------------------------------------------------------
#