]> CyberLeo.Net >> Repos - FreeBSD/stable/9.git/commit
projects / FreeBSD / stable / 9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d4591d7) | patch
MFstable/10 r233422:
authorngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Sun, 15 Nov 2015 21:16:13 +0000 (21:16 +0000)
committerngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Sun, 15 Nov 2015 21:16:13 +0000 (21:16 +0000)
commit44b38635a1c73769447c0310db9d15aa11eb56e1
tree50d0c5f0fb5c4d42edb60fb7bc183b89d7be2edftree | snapshot
parentd4591d7169fba731d09c58b3bef36967d49a2f5bcommit | diff
MFstable/10 r233422:

r233422 (by joel):

Remove superfluous paragraph macro.

Command used:
$ svn merge --accept mine-conflict -c 233422 ^/stable/10

Conflicts:
share/man/man4/netmap.4
share/man/man9/locking.9 (

git-svn-id: svn://svn.freebsd.org/base/stable/9@290886 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
37 files changed:
share/man/man4/acpi_hp.4 diff | blob | history
share/man/man4/adv.4 diff | blob | history
share/man/man4/ahc.4 diff | blob | history
share/man/man4/atkbd.4 diff | blob | history
share/man/man4/bridge.4 diff | blob | history
share/man/man4/cas.4 diff | blob | history
share/man/man4/cc_vegas.4 diff | blob | history
share/man/man4/cy.4 diff | blob | history
share/man/man4/dpms.4 diff | blob | history
share/man/man4/ed.4 diff | blob | history
share/man/man4/em.4 diff | blob | history
share/man/man4/epair.4 diff | blob | history
share/man/man4/fdc.4 diff | blob | history
share/man/man4/fwohci.4 diff | blob | history
share/man/man4/gem.4 diff | blob | history
share/man/man4/geom_fox.4 diff | blob | history
share/man/man4/geom_uzip.4 diff | blob | history
share/man/man4/hptiop.4 diff | blob | history
share/man/man4/igb.4 diff | blob | history
share/man/man4/ip.4 diff | blob | history
share/man/man4/isp.4 diff | blob | history
share/man/man4/man4.powerpc/bm.4 diff | blob | history
share/man/man4/man4.powerpc/snd_ai2s.4 diff | blob | history
share/man/man4/man4.powerpc/snd_davbus.4 diff | blob | history
share/man/man4/netmap.4 diff | blob | history
share/man/man4/ng_netflow.4 diff | blob | history
share/man/man4/nvram2env.4 diff | blob | history
share/man/man4/oce.4 diff | blob | history
share/man/man4/ppbus.4 diff | blob | history
share/man/man4/snd_emu10kx.4 diff | blob | history
share/man/man4/snd_hda.4 diff | blob | history
share/man/man4/u3g.4 diff | blob | history
share/man/man7/mailaddr.7 diff | blob | history
share/man/man9/DB_COMMAND.9 diff | blob | history
share/man/man9/fail.9 diff | blob | history
share/man/man9/lock.9 diff | blob | history
share/man/man9/make_dev.9 diff | blob | history
9-STABLE