projects
/
platform
/
upstream
/
glib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9b59059
)
Fix a mismerge
2.25.9
author
Matthias Clasen
<mclasen@redhat.com>
Thu, 17 Jun 2010 23:08:13 +0000
(19:08 -0400)
committer
Matthias Clasen
<mclasen@redhat.com>
Thu, 17 Jun 2010 23:08:52 +0000
(19:08 -0400)
docs/reference/gio/gio-sections.txt
patch
|
blob
|
history
diff --git
a/docs/reference/gio/gio-sections.txt
b/docs/reference/gio/gio-sections.txt
index
2771250
..
75faa93
100644
(file)
--- a/
docs/reference/gio/gio-sections.txt
+++ b/
docs/reference/gio/gio-sections.txt
@@
-2618,7
+2618,6
@@
g_simple_permission_get_type
</SECTION>
<SECTION>
-<FILE>gsimplepermission</FILE>
<FILE>gapplication</FILE>
GApplication
GApplicationClass