« back to all changes in this revision
Viewing changes to doc/ja/user-guide/resolving_conflicts.txt
- Committer: mbp at sourcefrog
- Date: 2005-10-20 05:32:20 UTC
- mto: (1185.41.1 bzr.sftp) (1534.1.1 integration) (1495.1.4) (1505.1.18 bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
- mto: This revision was merged to the branch mainline in revision 1484.
- Revision ID: mbp@sourcefrog.net-20051020053220-98d5bce475edc359
- rules for using destructors
- files modified:
- HACKING
added
removed
doc/ja/user-guide/resolving_conflicts.txt
