resolved conflicts
2f298951cff2
Actions

Authored by Steve Plimpton <sjplimp@sandia.gov> on Sep 14 2016, 18:22.

Description

resolved conflicts

Details

Committed

Steve Plimpton <sjplimp@sandia.gov>

Sep 14 2016, 18:22

Pushed

junge

Oct 19 2017, 09:53

Parents

rLAMMPS717e719b8300: HTML update

Branches

Unknown

Tags

Unknown

Event Timeline

Steve Plimpton <sjplimp@sandia.gov> committed rLAMMPS2f298951cff2: resolved conflicts (authored by Steve Plimpton <sjplimp@sandia.gov>).Sep 14 2016, 18:22

Changes (797)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			doc/html/Manual.html
	M			doc/html/Section_accelerate.html
	M			doc/html/Section_commands.html
	M			doc/html/Section_errors.html
	M			doc/html/Section_example.html
	M			doc/html/Section_history.html
	M			doc/html/Section_howto.html
	M			doc/html/Section_intro.html
	M			doc/html/Section_modify.html
	M			doc/html/Section_packages.html
	M			doc/html/Section_perf.html
	M			doc/html/Section_python.html
	M			doc/html/Section_start.html
	M			doc/html/Section_tools.html
	M			doc/html/accelerate_gpu.html
	M			doc/html/accelerate_intel.html
	M			doc/html/accelerate_kokkos.html
	M			doc/html/accelerate_omp.html
	M			doc/html/accelerate_opt.html
	M			doc/html/angle_charmm.html
	M			doc/html/angle_class2.html
	M			doc/html/angle_coeff.html
	M			doc/html/angle_cosine.html
	M			doc/html/angle_cosine_delta.html
	M			doc/html/angle_cosine_periodic.html
	M			doc/html/angle_cosine_shift.html
	M			doc/html/angle_cosine_shift_exp.html
	M			doc/html/angle_cosine_squared.html
	M			doc/html/angle_dipole.html
	M			doc/html/angle_fourier.html
	M			doc/html/angle_fourier_simple.html
	M			doc/html/angle_harmonic.html
	M			doc/html/angle_hybrid.html
	M			doc/html/angle_none.html
	M			doc/html/angle_quartic.html
	M			doc/html/angle_sdk.html
	M			doc/html/angle_style.html
	M			doc/html/angle_table.html
	M			doc/html/angle_zero.html
	A			doc/html/angles.html
	M			doc/html/atom_modify.html
	M			doc/html/atom_style.html
	M			doc/html/balance.html
	M			doc/html/body.html
	M			doc/html/bond_class2.html
	M			doc/html/bond_coeff.html
	M			doc/html/bond_fene.html
	M			doc/html/bond_fene_expand.html
	M			doc/html/bond_harmonic.html
	M			doc/html/bond_harmonic_shift.html
	M			doc/html/bond_harmonic_shift_cut.html
	M			doc/html/bond_hybrid.html
	M			doc/html/bond_morse.html
	M			doc/html/bond_none.html
	M			doc/html/bond_nonlinear.html
	M			doc/html/bond_quartic.html
	M			doc/html/bond_style.html
	M			doc/html/bond_table.html
	M			doc/html/bond_write.html
	M			doc/html/bond_zero.html
	A			doc/html/bonds.html
	M			doc/html/boundary.html
	M			doc/html/box.html
	M			doc/html/change_box.html
	M			doc/html/clear.html
	M			doc/html/comm_modify.html
	M			doc/html/comm_style.html
	A			doc/html/commands.html
	M			doc/html/compute.html
	M			doc/html/compute_ackland_atom.html
	M			doc/html/compute_angle.html
	M			doc/html/compute_angle_local.html
	M			doc/html/compute_angmom_chunk.html
	M			doc/html/compute_basal_atom.html
	M			doc/html/compute_body_local.html
	M			doc/html/compute_bond.html
	M			doc/html/compute_bond_local.html
	M			doc/html/compute_centro_atom.html
	M			doc/html/compute_chunk_atom.html
	M			doc/html/compute_cluster_atom.html
	M			doc/html/compute_cna_atom.html
	M			doc/html/compute_com.html
	M			doc/html/compute_com_chunk.html
	M			doc/html/compute_contact_atom.html
	M			doc/html/compute_coord_atom.html
	M			doc/html/compute_damage_atom.html
	M			doc/html/compute_dihedral.html
	M			doc/html/compute_dihedral_local.html
	M			doc/html/compute_dilatation_atom.html
	M			doc/html/compute_dipole_chunk.html
	M			doc/html/compute_displace_atom.html
	M			doc/html/compute_dpd.html
	M			doc/html/compute_dpd_atom.html
	M			doc/html/compute_erotate_asphere.html
	M			doc/html/compute_erotate_rigid.html
	M			doc/html/compute_erotate_sphere.html
	M			doc/html/compute_erotate_sphere_atom.html
	M			doc/html/compute_event_displace.html
	M			doc/html/compute_fep.html
	M			doc/html/compute_group_group.html
	M			doc/html/compute_gyration.html
	M			doc/html/compute_gyration_chunk.html
	M			doc/html/compute_heat_flux.html
	M			doc/html/compute_hexorder_atom.html
	M			doc/html/compute_improper.html
	M			doc/html/compute_improper_local.html
	M			doc/html/compute_inertia_chunk.html
	M			doc/html/compute_ke.html
	M			doc/html/compute_ke_atom.html
	M			doc/html/compute_ke_atom_eff.html
	M			doc/html/compute_ke_eff.html
	M			doc/html/compute_ke_rigid.html
	M			doc/html/compute_meso_e_atom.html
	M			doc/html/compute_meso_rho_atom.html
	M			doc/html/compute_meso_t_atom.html
	M			doc/html/compute_modify.html
	M			doc/html/compute_msd.html
	M			doc/html/compute_msd_chunk.html
	M			doc/html/compute_msd_nongauss.html
	M			doc/html/compute_omega_chunk.html
	M			doc/html/compute_orientorder_atom.html
	M			doc/html/compute_pair.html
	M			doc/html/compute_pair_local.html
	M			doc/html/compute_pe.html
	M			doc/html/compute_pe_atom.html
	M			doc/html/compute_plasticity_atom.html
	M			doc/html/compute_pressure.html
	M			doc/html/compute_property_atom.html
	M			doc/html/compute_property_chunk.html
	M			doc/html/compute_property_local.html
	M			doc/html/compute_rdf.html
	M			doc/html/compute_reduce.html
	M			doc/html/compute_rigid_local.html
	M			doc/html/compute_saed.html
	M			doc/html/compute_slice.html
	M			doc/html/compute_smd_contact_radius.html
	M			doc/html/compute_smd_damage.html
	M			doc/html/compute_smd_hourglass_error.html
	M			doc/html/compute_smd_internal_energy.html
	M			doc/html/compute_smd_plastic_strain.html
	M			doc/html/compute_smd_plastic_strain_rate.html
	M			doc/html/compute_smd_rho.html
	M			doc/html/compute_smd_tlsph_defgrad.html
	M			doc/html/compute_smd_tlsph_dt.html
	M			doc/html/compute_smd_tlsph_num_neighs.html
	M			doc/html/compute_smd_tlsph_shape.html
	M			doc/html/compute_smd_tlsph_strain.html
	M			doc/html/compute_smd_tlsph_strain_rate.html
	M			doc/html/compute_smd_tlsph_stress.html
	M			doc/html/compute_smd_triangle_mesh_vertices.html
	M			doc/html/compute_smd_ulsph_num_neighs.html
	M			doc/html/compute_smd_ulsph_strain.html
	M			doc/html/compute_smd_ulsph_strain_rate.html
	M			doc/html/compute_smd_ulsph_stress.html
	M			doc/html/compute_smd_vol.html
	M			doc/html/compute_sna_atom.html
	M			doc/html/compute_stress_atom.html
	M			doc/html/compute_tally.html
	M			doc/html/compute_temp.html
	M			doc/html/compute_temp_asphere.html
	M			doc/html/compute_temp_body.html
	M			doc/html/compute_temp_chunk.html
	M			doc/html/compute_temp_com.html
	M			doc/html/compute_temp_cs.html
	M			doc/html/compute_temp_deform.html
	M			doc/html/compute_temp_deform_eff.html
	M			doc/html/compute_temp_drude.html
	M			doc/html/compute_temp_eff.html
	M			doc/html/compute_temp_partial.html
	M			doc/html/compute_temp_profile.html
	M			doc/html/compute_temp_ramp.html
	M			doc/html/compute_temp_region.html
	M			doc/html/compute_temp_region_eff.html
	M			doc/html/compute_temp_rotate.html
	M			doc/html/compute_temp_sphere.html
	M			doc/html/compute_ti.html
	M			doc/html/compute_torque_chunk.html
	M			doc/html/compute_vacf.html
	M			doc/html/compute_vcm_chunk.html
	M			doc/html/compute_voronoi_atom.html
	M			doc/html/compute_xrd.html
	A			doc/html/computes.html
	M			doc/html/create_atoms.html
	M			doc/html/create_bonds.html
	M			doc/html/create_box.html
	M			doc/html/delete_atoms.html
	M			doc/html/delete_bonds.html
	M			doc/html/dielectric.html
	M			doc/html/dihedral_charmm.html
	M			doc/html/dihedral_class2.html
	M			doc/html/dihedral_coeff.html
	M			doc/html/dihedral_cosine_shift_exp.html
	M			doc/html/dihedral_fourier.html
	M			doc/html/dihedral_harmonic.html
	M			doc/html/dihedral_helix.html
	M			doc/html/dihedral_hybrid.html
	M			doc/html/dihedral_multi_harmonic.html
	M			doc/html/dihedral_nharmonic.html
	M			doc/html/dihedral_none.html
	M			doc/html/dihedral_opls.html
	M			doc/html/dihedral_quadratic.html
	M			doc/html/dihedral_spherical.html
	M			doc/html/dihedral_style.html
	M			doc/html/dihedral_table.html
	M			doc/html/dihedral_zero.html
	A			doc/html/dihedrals.html
	M			doc/html/dimension.html
	M			doc/html/displace_atoms.html
	M			doc/html/dump.html
	M			doc/html/dump_custom_vtk.html
	M			doc/html/dump_h5md.html
	M			doc/html/dump_image.html
	M			doc/html/dump_modify.html
	M			doc/html/dump_molfile.html
	M			doc/html/echo.html
	M			doc/html/fix.html
	M			doc/html/fix_adapt.html
	M			doc/html/fix_adapt_fep.html
	M			doc/html/fix_addforce.html
	M			doc/html/fix_addtorque.html
	M			doc/html/fix_append_atoms.html
	M			doc/html/fix_atc.html
	M			doc/html/fix_atom_swap.html
	M			doc/html/fix_ave_atom.html
	M			doc/html/fix_ave_chunk.html
	M			doc/html/fix_ave_correlate.html
	M			doc/html/fix_ave_correlate_long.html
	M			doc/html/fix_ave_histo.html
	M			doc/html/fix_ave_time.html
	M			doc/html/fix_aveforce.html
	M			doc/html/fix_balance.html
	M			doc/html/fix_bond_break.html
	M			doc/html/fix_bond_create.html
	M			doc/html/fix_bond_swap.html
	M			doc/html/fix_box_relax.html
	M			doc/html/fix_colvars.html
	M			doc/html/fix_controller.html
	M			doc/html/fix_deform.html
	M			doc/html/fix_deposit.html
	M			doc/html/fix_drag.html
	M			doc/html/fix_drude.html
	M			doc/html/fix_drude_transform.html
	M			doc/html/fix_dt_reset.html
	M			doc/html/fix_efield.html
	M			doc/html/fix_ehex.html
	M			doc/html/fix_enforce2d.html
	M			doc/html/fix_eos_cv.html
	M			doc/html/fix_eos_table.html
	M			doc/html/fix_eos_table_rx.html
	M			doc/html/fix_evaporate.html
	M			doc/html/fix_external.html
	M			doc/html/fix_flow_gauss.html
	M			doc/html/fix_freeze.html
	M			doc/html/fix_gcmc.html
	M			doc/html/fix_gld.html
	M			doc/html/fix_gle.html
	M			doc/html/fix_gravity.html
	M			doc/html/fix_heat.html
	M			doc/html/fix_imd.html
	M			doc/html/fix_indent.html
	M			doc/html/fix_ipi.html
	M			doc/html/fix_langevin.html
	M			doc/html/fix_langevin_drude.html
	M			doc/html/fix_langevin_eff.html
	M			doc/html/fix_lb_fluid.html
	M			doc/html/fix_lb_momentum.html
	M			doc/html/fix_lb_pc.html
	M			doc/html/fix_lb_rigid_pc_sphere.html
	M			doc/html/fix_lb_viscous.html
	M			doc/html/fix_lineforce.html
	M			doc/html/fix_manifoldforce.html
	M			doc/html/fix_meso.html
	M			doc/html/fix_meso_stationary.html
	M			doc/html/fix_modify.html
	M			doc/html/fix_momentum.html
	M			doc/html/fix_move.html
	M			doc/html/fix_msst.html
	M			doc/html/fix_neb.html
	M			doc/html/fix_nh.html
	M			doc/html/fix_nh_eff.html
	M			doc/html/fix_nph_asphere.html
	M			doc/html/fix_nph_body.html
	M			doc/html/fix_nph_sphere.html
	M			doc/html/fix_nphug.html
	M			doc/html/fix_npt_asphere.html
	M			doc/html/fix_npt_body.html
	M			doc/html/fix_npt_sphere.html
	M			doc/html/fix_nve.html
	M			doc/html/fix_nve_asphere.html
	M			doc/html/fix_nve_asphere_noforce.html
	M			doc/html/fix_nve_body.html
	M			doc/html/fix_nve_eff.html
	M			doc/html/fix_nve_limit.html
	M			doc/html/fix_nve_line.html
	M			doc/html/fix_nve_manifold_rattle.html
	M			doc/html/fix_nve_noforce.html
	M			doc/html/fix_nve_sphere.html
	M			doc/html/fix_nve_tri.html
	M			doc/html/fix_nvt_asphere.html
	M			doc/html/fix_nvt_body.html
	M			doc/html/fix_nvt_manifold_rattle.html
	M			doc/html/fix_nvt_sllod.html
	M			doc/html/fix_nvt_sllod_eff.html
	M			doc/html/fix_nvt_sphere.html
	M			doc/html/fix_oneway.html
	M			doc/html/fix_orient.html
	M			doc/html/fix_phonon.html
	M			doc/html/fix_pimd.html
	M			doc/html/fix_planeforce.html
	M			doc/html/fix_poems.html
	M			doc/html/fix_pour.html
	M			doc/html/fix_press_berendsen.html
	M			doc/html/fix_print.html
	M			doc/html/fix_property_atom.html
	M			doc/html/fix_qbmsst.html
	M			doc/html/fix_qeq.html
	M			doc/html/fix_qeq_comb.html
	M			doc/html/fix_qeq_reax.html
	M			doc/html/fix_qmmm.html
	M			doc/html/fix_qtb.html
	M			doc/html/fix_reax_bonds.html
	M			doc/html/fix_reaxc_species.html
	M			doc/html/fix_recenter.html
	M			doc/html/fix_restrain.html
	M			doc/html/fix_rigid.html
	M			doc/html/fix_rx.html
	M			doc/html/fix_saed_vtk.html
	M			doc/html/fix_setforce.html
	M			doc/html/fix_shake.html
	M			doc/html/fix_shardlow.html
	M			doc/html/fix_smd.html
	M			doc/html/fix_smd_adjust_dt.html
	M			doc/html/fix_smd_integrate_tlsph.html
	M			doc/html/fix_smd_integrate_ulsph.html
	M			doc/html/fix_smd_move_triangulated_surface.html
	M			doc/html/fix_smd_setvel.html
	M			doc/html/fix_smd_wall_surface.html
	M			doc/html/fix_spring.html
	M			doc/html/fix_spring_chunk.html
	M			doc/html/fix_spring_rg.html
	M			doc/html/fix_spring_self.html
	M			doc/html/fix_srd.html
	M			doc/html/fix_store_force.html
	M			doc/html/fix_store_state.html
	M			doc/html/fix_temp_berendsen.html
	M			doc/html/fix_temp_csvr.html
	M			doc/html/fix_temp_rescale.html
	M			doc/html/fix_temp_rescale_eff.html
	M			doc/html/fix_tfmc.html
	M			doc/html/fix_thermal_conductivity.html
	M			doc/html/fix_ti_rs.html
	M			doc/html/fix_ti_spring.html
	M			doc/html/fix_tmd.html
	M			doc/html/fix_ttm.html
	M			doc/html/fix_tune_kspace.html
	M			doc/html/fix_vector.html
	M			doc/html/fix_viscosity.html
	M			doc/html/fix_viscous.html
	M			doc/html/fix_wall.html
	M			doc/html/fix_wall_gran.html
	M			doc/html/fix_wall_piston.html
	M			doc/html/fix_wall_reflect.html
	M			doc/html/fix_wall_region.html
	M			doc/html/fix_wall_srd.html
	A			doc/html/fixes.html
	M			doc/html/genindex.html
	M			doc/html/group.html
	M			doc/html/group2ndx.html
	M			doc/html/if.html
	M			doc/html/improper_class2.html
	M			doc/html/improper_coeff.html
	M			doc/html/improper_cossq.html
	M			doc/html/improper_cvff.html
	M			doc/html/improper_distance.html
	M			doc/html/improper_fourier.html
	M			doc/html/improper_harmonic.html
	M			doc/html/improper_hybrid.html
	M			doc/html/improper_none.html
	M			doc/html/improper_ring.html
	M			doc/html/improper_style.html
	M			doc/html/improper_umbrella.html
	M			doc/html/improper_zero.html
	A			doc/html/impropers.html
	M			doc/html/include.html
	M			doc/html/info.html
	M			doc/html/jump.html
	M			doc/html/kspace_modify.html
	M			doc/html/kspace_style.html
	M			doc/html/label.html
	M			doc/html/lattice.html
	M			doc/html/log.html
	M			doc/html/manifolds.html
	M			doc/html/mass.html
	M			doc/html/min_modify.html
	M			doc/html/min_style.html
	M			doc/html/minimize.html
	M			doc/html/molecule.html
	M			doc/html/neb.html
	M			doc/html/neigh_modify.html
	M			doc/html/neighbor.html
	M			doc/html/newton.html
	M			doc/html/next.html
	M			doc/html/package.html
	M			doc/html/pair_adp.html
	M			doc/html/pair_airebo.html
	M			doc/html/pair_awpmd.html
	M			doc/html/pair_beck.html
	M			doc/html/pair_body.html
	M			doc/html/pair_bop.html
	M			doc/html/pair_born.html
	M			doc/html/pair_brownian.html
	M			doc/html/pair_buck.html
	M			doc/html/pair_buck_long.html
	M			doc/html/pair_charmm.html
	M			doc/html/pair_class2.html
	M			doc/html/pair_coeff.html
	M			doc/html/pair_colloid.html
	M			doc/html/pair_comb.html
	M			doc/html/pair_coul.html
	M			doc/html/pair_coul_diel.html
	M			doc/html/pair_cs.html
	M			doc/html/pair_dipole.html
	M			doc/html/pair_dpd.html
	M			doc/html/pair_dpd_fdt.html
	M			doc/html/pair_dsmc.html
	M			doc/html/pair_eam.html
	M			doc/html/pair_edip.html
	M			doc/html/pair_eff.html
	M			doc/html/pair_eim.html
	M			doc/html/pair_exp6_rx.html
	M			doc/html/pair_gauss.html
	M			doc/html/pair_gayberne.html
	M			doc/html/pair_gran.html
	M			doc/html/pair_gromacs.html
	M			doc/html/pair_hbond_dreiding.html
	M			doc/html/pair_hybrid.html
	M			doc/html/pair_kim.html
	M			doc/html/pair_lcbop.html
	M			doc/html/pair_line_lj.html
	M			doc/html/pair_list.html
	M			doc/html/pair_lj.html
	M			doc/html/pair_lj96.html
	M			doc/html/pair_lj_cubic.html
	M			doc/html/pair_lj_expand.html
	M			doc/html/pair_lj_long.html
	M			doc/html/pair_lj_sf.html
	M			doc/html/pair_lj_smooth.html
	M			doc/html/pair_lj_smooth_linear.html
	M			doc/html/pair_lj_soft.html
	M			doc/html/pair_lubricate.html
	M			doc/html/pair_lubricateU.html
	M			doc/html/pair_mdf.html
	M			doc/html/pair_meam.html
	M			doc/html/pair_meam_spline.html
	M			doc/html/pair_meam_sw_spline.html
	M			doc/html/pair_mgpt.html
	M			doc/html/pair_mie.html
	M			doc/html/pair_modify.html
	M			doc/html/pair_morse.html
	M			doc/html/pair_multi_lucy.html
	M			doc/html/pair_multi_lucy_rx.html
	M			doc/html/pair_nb3b_harmonic.html
	M			doc/html/pair_nm.html
	M			doc/html/pair_none.html
	M			doc/html/pair_peri.html
	M			doc/html/pair_polymorphic.html
	M			doc/html/pair_quip.html
	M			doc/html/pair_reax.html
	M			doc/html/pair_reax_c.html
	M			doc/html/pair_resquared.html
	M			doc/html/pair_sdk.html
	M			doc/html/pair_smd_hertz.html
	M			doc/html/pair_smd_tlsph.html
	M			doc/html/pair_smd_triangulated_surface.html
	M			doc/html/pair_smd_ulsph.html
	M			doc/html/pair_smtbq.html
	M			doc/html/pair_snap.html
	M			doc/html/pair_soft.html
	M			doc/html/pair_sph_heatconduction.html
	M			doc/html/pair_sph_idealgas.html
	M			doc/html/pair_sph_lj.html
	M			doc/html/pair_sph_rhosum.html
	M			doc/html/pair_sph_taitwater.html
	M			doc/html/pair_sph_taitwater_morris.html
	M			doc/html/pair_srp.html
	M			doc/html/pair_style.html
	M			doc/html/pair_sw.html
	M			doc/html/pair_table.html
	M			doc/html/pair_table_rx.html
	M			doc/html/pair_tersoff.html
	M			doc/html/pair_tersoff_mod.html
	M			doc/html/pair_tersoff_zbl.html
	M			doc/html/pair_thole.html
	M			doc/html/pair_tri_lj.html
	M			doc/html/pair_vashishta.html
	M			doc/html/pair_write.html
	M			doc/html/pair_yukawa.html
	M			doc/html/pair_yukawa_colloid.html
	M			doc/html/pair_zbl.html
	M			doc/html/pair_zero.html
	A			doc/html/pairs.html
	M			doc/html/partition.html
	M			doc/html/prd.html
	M			doc/html/print.html
	M			doc/html/processors.html
	M			doc/html/python.html
	M			doc/html/quit.html
	M			doc/html/read_data.html
	M			doc/html/read_dump.html
	M			doc/html/read_restart.html
	M			doc/html/region.html
	M			doc/html/replicate.html
	M			doc/html/rerun.html
	M			doc/html/reset_timestep.html
	M			doc/html/restart.html
	M			doc/html/run.html
	M			doc/html/run_style.html
	M			doc/html/search.html
	M			doc/html/set.html
	M			doc/html/shell.html
	M			doc/html/special_bonds.html
	M			doc/html/suffix.html
	M			doc/html/tad.html
	M			doc/html/temper.html
	M			doc/html/thermo.html
	M			doc/html/thermo_modify.html
	M			doc/html/thermo_style.html
	M			doc/html/timer.html
	M			doc/html/timestep.html
	M			doc/html/tutorial_drude.html
	M			doc/html/tutorial_github.html
	A			doc/html/tutorials.html
	M			doc/html/uncompute.html
	M			doc/html/undump.html
	M			doc/html/unfix.html
	M			doc/html/units.html
	M			doc/html/variable.html
	M			doc/html/velocity.html
	M			doc/html/write_coeff.html
	M			doc/html/write_data.html
	M			doc/html/write_dump.html
	M			doc/html/write_restart.html
	M			doc/src/Manual.txt
	M			doc/src/Section_accelerate.txt
	M			doc/src/Section_commands.txt
	M			doc/src/Section_errors.txt
	M			doc/src/Section_history.txt
	M			doc/src/Section_howto.txt
	M			doc/src/Section_intro.txt
	M			doc/src/Section_modify.txt
	M			doc/src/Section_packages.txt
	M			doc/src/Section_python.txt
	M			doc/src/Section_start.txt
	M			doc/src/Section_tools.txt
	M			doc/src/accelerate_gpu.txt
	M			doc/src/accelerate_intel.txt
	M			doc/src/accelerate_kokkos.txt
	M			doc/src/accelerate_omp.txt
	M			doc/src/accelerate_opt.txt
	M			doc/src/angle_charmm.txt
	M			doc/src/angle_class2.txt
	M			doc/src/angle_cosine.txt
	M			doc/src/angle_cosine_delta.txt
	M			doc/src/angle_cosine_periodic.txt
	M			doc/src/angle_cosine_shift.txt
	M			doc/src/angle_cosine_shift_exp.txt
	M			doc/src/angle_cosine_squared.txt
	M			doc/src/angle_dipole.txt
	M			doc/src/angle_fourier.txt
	M			doc/src/angle_fourier_simple.txt
	M			doc/src/angle_harmonic.txt
	M			doc/src/angle_quartic.txt
	M			doc/src/angle_table.txt
	A			doc/src/angles.txt
	M			doc/src/atom_style.txt
	M			doc/src/balance.txt
	M			doc/src/body.txt
	M			doc/src/bond_class2.txt
	M			doc/src/bond_fene.txt
	M			doc/src/bond_fene_expand.txt
	M			doc/src/bond_harmonic.txt
	M			doc/src/bond_harmonic_shift.txt
	M			doc/src/bond_harmonic_shift_cut.txt
	M			doc/src/bond_morse.txt
	M			doc/src/bond_nonlinear.txt
	M			doc/src/bond_quartic.txt
	M			doc/src/bond_table.txt
	A			doc/src/bonds.txt
	M			doc/src/boundary.txt
	M			doc/src/change_box.txt
	A			doc/src/commands.txt
	M			doc/src/compute_ackland_atom.txt
	M			doc/src/compute_angmom_chunk.txt
	M			doc/src/compute_basal_atom.txt
	M			doc/src/compute_body_local.txt
	M			doc/src/compute_centro_atom.txt
	M			doc/src/compute_chunk_atom.txt
	M			doc/src/compute_cluster_atom.txt
	M			doc/src/compute_cna_atom.txt
	M			doc/src/compute_com_chunk.txt
	M			doc/src/compute_contact_atom.txt
	M			doc/src/compute_coord_atom.txt
	M			doc/src/compute_damage_atom.txt
	M			doc/src/compute_dipole_chunk.txt
	M			doc/src/compute_displace_atom.txt
	M			doc/src/compute_dpd_atom.txt
	M			doc/src/compute_erotate_asphere.txt
	M			doc/src/compute_erotate_rigid.txt
	M			doc/src/compute_erotate_sphere.txt
	M			doc/src/compute_erotate_sphere_atom.txt
	M			doc/src/compute_event_displace.txt
	M			doc/src/compute_fep.txt
	M			doc/src/compute_gyration.txt
	M			doc/src/compute_gyration_chunk.txt
	M			doc/src/compute_hexorder_atom.txt
	M			doc/src/compute_inertia_chunk.txt
	M			doc/src/compute_ke.txt
	M			doc/src/compute_ke_atom.txt
	M			doc/src/compute_ke_atom_eff.txt
	M			doc/src/compute_ke_eff.txt
	M			doc/src/compute_ke_rigid.txt
	M			doc/src/compute_meso_e_atom.txt
	M			doc/src/compute_meso_rho_atom.txt
	M			doc/src/compute_meso_t_atom.txt
	M			doc/src/compute_msd_chunk.txt
	M			doc/src/compute_omega_chunk.txt
	M			doc/src/compute_orientorder_atom.txt
	M			doc/src/compute_pe.txt
	M			doc/src/compute_pe_atom.txt
	M			doc/src/compute_pressure.txt
	M			doc/src/compute_property_chunk.txt
	M			doc/src/compute_rdf.txt
	M			doc/src/compute_reduce.txt
	M			doc/src/compute_smd_contact_radius.txt
	M			doc/src/compute_smd_triangle_mesh_vertices.txt
	M			doc/src/compute_smd_ulsph_num_neighs.txt
	M			doc/src/compute_smd_ulsph_strain.txt
	M			doc/src/compute_smd_ulsph_strain_rate.txt
	M			doc/src/compute_smd_ulsph_stress.txt
	M			doc/src/compute_sna_atom.txt
	M			doc/src/compute_stress_atom.txt
	M			doc/src/compute_temp.txt
	M			doc/src/compute_temp_chunk.txt
	M			doc/src/compute_temp_cs.txt
	M			doc/src/compute_temp_partial.txt
	M			doc/src/compute_ti.txt
	M			doc/src/compute_torque_chunk.txt
	M			doc/src/compute_vcm_chunk.txt
	M			doc/src/compute_voronoi_atom.txt
	M			doc/src/compute_xrd.txt
	A			doc/src/computes.txt
	M			doc/src/create_box.txt
	M			doc/src/dihedral_charmm.txt
	M			doc/src/dihedral_class2.txt
	M			doc/src/dihedral_coeff.txt
	M			doc/src/dihedral_cosine_shift_exp.txt
	M			doc/src/dihedral_fourier.txt
	M			doc/src/dihedral_harmonic.txt
	M			doc/src/dihedral_helix.txt
	M			doc/src/dihedral_multi_harmonic.txt
	M			doc/src/dihedral_nharmonic.txt
	M			doc/src/dihedral_opls.txt
	M			doc/src/dihedral_quadratic.txt
	M			doc/src/dihedral_spherical.txt
	M			doc/src/dihedral_table.txt
	A			doc/src/dihedrals.txt
	M			doc/src/dimension.txt
	M			doc/src/dump.txt
	M			doc/src/dump_custom_vtk.txt
	M			doc/src/dump_image.txt
	M			doc/src/fix_addforce.txt
	M			doc/src/fix_ave_chunk.txt
	M			doc/src/fix_aveforce.txt
	M			doc/src/fix_balance.txt
	M			doc/src/fix_deform.txt
	M			doc/src/fix_enforce2d.txt
	M			doc/src/fix_freeze.txt
	M			doc/src/fix_gle.txt
	M			doc/src/fix_gravity.txt
	M			doc/src/fix_ipi.txt
	M			doc/src/fix_langevin.txt
	M			doc/src/fix_lb_rigid_pc_sphere.txt
	M			doc/src/fix_neb.txt
	M			doc/src/fix_nh.txt
	M			doc/src/fix_nph_asphere.txt
	M			doc/src/fix_nph_body.txt
	M			doc/src/fix_nph_sphere.txt
	M			doc/src/fix_nphug.txt
	M			doc/src/fix_npt_asphere.txt
	M			doc/src/fix_npt_body.txt
	M			doc/src/fix_npt_sphere.txt
	M			doc/src/fix_nve.txt
	M			doc/src/fix_nve_asphere.txt
	M			doc/src/fix_nve_body.txt
	M			doc/src/fix_nve_line.txt
	M			doc/src/fix_nve_manifold_rattle.txt
	M			doc/src/fix_nve_sphere.txt
	M			doc/src/fix_nve_tri.txt
	M			doc/src/fix_nvt_asphere.txt
	M			doc/src/fix_nvt_body.txt
	M			doc/src/fix_nvt_manifold_rattle.txt
	M			doc/src/fix_nvt_sllod.txt
	M			doc/src/fix_nvt_sphere.txt
	M			doc/src/fix_qeq_comb.txt
	M			doc/src/fix_qeq_reax.txt
	M			doc/src/fix_rigid.txt
	M			doc/src/fix_rx.txt
	M			doc/src/fix_setforce.txt
	M			doc/src/fix_shake.txt
	M			doc/src/fix_shardlow.txt
	D			doc/src/fix_smd_tlsph_reference_configuration.txt
	M			doc/src/fix_ti_spring.txt
	M			doc/src/fix_tune_kspace.txt
	M			doc/src/fix_viscosity.txt
	M			doc/src/fix_wall_reflect.txt
	A			doc/src/fixes.txt
	M			doc/src/group.txt
	M			doc/src/if.txt
	M			doc/src/improper_class2.txt
	M			doc/src/improper_cossq.txt
	M			doc/src/improper_cvff.txt
	M			doc/src/improper_fourier.txt
	M			doc/src/improper_harmonic.txt
	M			doc/src/improper_ring.txt
	M			doc/src/improper_umbrella.txt
	A			doc/src/impropers.txt
	M			doc/src/kspace_style.txt
	M			doc/src/log.txt
	M			doc/src/manifolds.txt
	M			doc/src/molecule.txt
	M			doc/src/neb.txt
	M			doc/src/pair_adp.txt
	M			doc/src/pair_airebo.txt
	M			doc/src/pair_beck.txt
	M			doc/src/pair_body.txt
	M			doc/src/pair_born.txt
	M			doc/src/pair_buck.txt
	M			doc/src/pair_buck_long.txt
	M			doc/src/pair_charmm.txt
	M			doc/src/pair_class2.txt
	M			doc/src/pair_colloid.txt
	M			doc/src/pair_comb.txt
	M			doc/src/pair_coul.txt
	M			doc/src/pair_cs.txt
	M			doc/src/pair_dipole.txt
	M			doc/src/pair_dpd.txt
	M			doc/src/pair_eam.txt
	M			doc/src/pair_edip.txt
	M			doc/src/pair_eim.txt
	M			doc/src/pair_gauss.txt
	M			doc/src/pair_gayberne.txt
	M			doc/src/pair_gran.txt
	M			doc/src/pair_gromacs.txt
	M			doc/src/pair_hbond_dreiding.txt
	M			doc/src/pair_hybrid.txt
	M			doc/src/pair_lj.txt
	M			doc/src/pair_lj96.txt
	M			doc/src/pair_lj_cubic.txt
	M			doc/src/pair_lj_expand.txt
	M			doc/src/pair_lj_long.txt
	M			doc/src/pair_lj_sf.txt
	M			doc/src/pair_lj_smooth.txt
	M			doc/src/pair_lj_smooth_linear.txt
	M			doc/src/pair_lj_soft.txt
	M			doc/src/pair_meam_spline.txt
	M			doc/src/pair_morse.txt
	M			doc/src/pair_nb3b_harmonic.txt
	M			doc/src/pair_nm.txt
	M			doc/src/pair_peri.txt
	M			doc/src/pair_reax_c.txt
	M			doc/src/pair_resquared.txt
	M			doc/src/pair_sdk.txt
	M			doc/src/pair_soft.txt
	M			doc/src/pair_sw.txt
	M			doc/src/pair_table.txt
	M			doc/src/pair_tersoff.txt
	M			doc/src/pair_tersoff_mod.txt
	M			doc/src/pair_tersoff_zbl.txt
	M			doc/src/pair_thole.txt
	M			doc/src/pair_vashishta.txt
	M			doc/src/pair_yukawa.txt
	M			doc/src/pair_yukawa_colloid.txt
	M			doc/src/pair_zbl.txt
	A			doc/src/pairs.txt
	M			doc/src/partition.txt
	M			doc/src/prd.txt
	M			doc/src/read_data.txt
	M			doc/src/read_restart.txt
	M			doc/src/region.txt
	M			doc/src/run_style.txt
	M			doc/src/tad.txt
	M			doc/src/temper.txt
	M			doc/src/thermo_style.txt
	A			doc/src/tutorials.txt
	M			doc/utils/converters/lammpsdoc/txt2html.py
	M			doc/utils/converters/lammpsdoc/txt2rst.py
	M			doc/utils/converters/tests/test_txt2rst.py