diff options
| author | Joakim Verona | 2012-02-23 18:11:38 +0100 |
|---|---|---|
| committer | Joakim Verona | 2012-02-23 18:11:38 +0100 |
| commit | 286c3fc8cad641cd607dbfa5cca4868603797924 (patch) | |
| tree | 3bf98246eb58dff28c82f0194e66609472856c4a | |
| parent | dc6aff34d82f07959eae182f2ad2d30701ea07e6 (diff) | |
| parent | a310be98ac999bd409bc21274072633aa2f2a9c0 (diff) | |
| download | emacs-286c3fc8cad641cd607dbfa5cca4868603797924.tar.gz emacs-286c3fc8cad641cd607dbfa5cca4868603797924.zip | |
minor conflict between upstream and local
| -rw-r--r-- | README.xwidget | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/README.xwidget b/README.xwidget index c4674df0079..fa3f9dabfde 100644 --- a/README.xwidget +++ b/README.xwidget | |||
| @@ -1558,8 +1558,8 @@ when an xwidget is removed from xwidget-alist, and there are no other | |||
| 1558 | references(mostly views) the xwidget should be garbage collected. | 1558 | references(mostly views) the xwidget should be garbage collected. |
| 1559 | 1559 | ||
| 1560 | special finalization would go into gc_sweep() | 1560 | special finalization would go into gc_sweep() |
| 1561 | <<<<<<< TREE | ||
| 1561 | ** TODO embedding evince | 1562 | ** TODO embedding evince |
| 1562 | http://developer.gnome.org/libevview/3.2/libevview-ev-view.html | 1563 | http://developer.gnome.org/libevview/3.2/libevview-ev-view.html |
| 1563 | would be useful for reading PDF:s and other document types. | 1564 | would be useful for reading PDF:s and other document types. |
| 1564 | |||
| 1565 | it would work the same way webkit embedding works. | 1565 | it would work the same way webkit embedding works. |