Merge master into places-sidebar to keep up with development

2012-10-19 11:35:22 -05:00
parent 4de4d6a6a7 f0a211a1df
commit 1dfd0e8c9b
416 changed files with 219126 additions and 56116 deletions
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@ -210,6 +210,7 @@ gtk/gtktextbufferrichtext.c
 gtk/gtktextbufferserialize.c
 gtk/gtktextchild.c
 gtk/gtktextdisplay.c
+gtk/gtktexthandle.c
 gtk/gtktextiter.c
 gtk/gtktextlayout.c
 gtk/gtktextmark.c