# HG changeset patch # User Oleksandr Gavenko # Date 1281211834 -10800 # Node ID 846340fce4f2d9481f81d9f919a2e90298a65954 # Parent ea05ac5655ef8cf2f7998749299e23441c0659db# Parent dd7fc4e35e0faf60deb32db3f892203f3f99dba4 Automated merge with file:///cygdrive/d/srv/hg/admin-doc diff -r ea05ac5655ef -r 846340fce4f2 3d.rst diff -r ea05ac5655ef -r 846340fce4f2 bnf.rst diff -r ea05ac5655ef -r 846340fce4f2 color.rst diff -r ea05ac5655ef -r 846340fce4f2 cygwin.rst diff -r ea05ac5655ef -r 846340fce4f2 devel-rules.rst diff -r ea05ac5655ef -r 846340fce4f2 display.rst diff -r ea05ac5655ef -r 846340fce4f2 emul.rst diff -r ea05ac5655ef -r 846340fce4f2 gamepad.rst diff -r ea05ac5655ef -r 846340fce4f2 make.rst diff -r ea05ac5655ef -r 846340fce4f2 midi.rst diff -r ea05ac5655ef -r 846340fce4f2 msvc.rst diff -r ea05ac5655ef -r 846340fce4f2 power.rst diff -r ea05ac5655ef -r 846340fce4f2 prettyprint.rst diff -r ea05ac5655ef -r 846340fce4f2 record.rst diff -r ea05ac5655ef -r 846340fce4f2 signal.rst diff -r ea05ac5655ef -r 846340fce4f2 ssh.rst diff -r ea05ac5655ef -r 846340fce4f2 uri.rst diff -r ea05ac5655ef -r 846340fce4f2 web.rst diff -r ea05ac5655ef -r 846340fce4f2 wget.rst diff -r ea05ac5655ef -r 846340fce4f2 xml.rst