fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-02-18 09:30:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dbus-1.4'

Browse source 
Conflicts:
	NEWS
This commit is contained in:
Simon McVittie 2012-02-08 19:06:51 +00:00
commit 2a8be5a2f5
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -18,6 +18,9 @@ D-Bus 1.5.10 (UNRELEASED)
• Avoid use of deprecated GThread API (fd.o #44413, Martin Pitt)
• Build documentation correctly if man2html doesn't support filenames on
its command-line (fd.o #43875, Jack Nagel)
• Unix-specific:
· Use epoll(7) for a more efficient main loop in Linux; equivalent patches
welcomed for other OSs' equivalents like kqueue, /dev/poll, or Solaris

2
doc/Makefile.am
View file

@ -118,7 +118,7 @@ if DBUS_HAVE_MAN2HTML
html_DATA += $(MAN_HTML_FILES)
%.1.html: %.1
$(AM_V_GEN)( $(MAN2HTML) $< > $@.tmp && mv $@.tmp $@ )
$(AM_V_GEN)( $(MAN2HTML) < $< > $@.tmp && mv $@.tmp $@ )
endif
if DBUS_CAN_UPLOAD_DOCS