« back to all changes in this revision
Viewing changes to src/scripting/doc/source/auxiliary.rst
- Committer: Jens Beyer (Qcumber-some)
- Date: 2010-05-28 14:51:37 UTC
- mfrom: (5149.1.226 trunk)
- Revision ID: qcumber-some@buerotiger.de-20100528145137-0pyil9qw7szyztsw
Merge from trunk
- files added:
- campaigns/t02.wmf/scripting/starting_conditions.lua
- files removed:
- campaigns/t01.wmf/scripting/khantrukhs_texts.lua
- files renamed:
- scripting/smooth_move.lua => scripting/ui.lua
- src/scripting/doc/source/aux.rst => src/scripting/doc/source/auxiliary.rst
- files modified:
- CMakeLists.txt
- tribes/empire/fisher/fishing_00.png *
- tribes/empire/fisher/fishing_01.png *
- tribes/empire/fisher/fishing_02.png *
- tribes/empire/fisher/fishing_03.png *
- tribes/empire/fisher/fishing_04.png *
- tribes/empire/fisher/fishing_05.png *
- tribes/empire/fisher/fishing_06.png *
- tribes/empire/fisher/fishing_07.png *
- tribes/empire/fisher/fishing_08.png *
- tribes/empire/fisher/fishing_09.png *
- tribes/empire/fisher/fishing_10.png *
- tribes/empire/fisher/fishing_11.png *
- tribes/empire/fisher/fishing_12.png *
- tribes/empire/fisher/fishing_13.png *
- tribes/empire/fisher/fishing_14.png *
- tribes/empire/fisher/fishing_15.png *
- tribes/empire/fisher/fishing_16.png *
- tribes/empire/fisher/fishing_17.png *
- tribes/empire/fisher/fishing_18.png *
- tribes/empire/fisher/fishing_19.png *
- tribes/empire/fisher/walk_e_10.png *
- tribes/empire/fisher/walk_e_11.png *
- tribes/empire/fisher/walk_e_12.png *
- tribes/empire/fisher/walk_e_13.png *
- tribes/empire/fisher/walk_e_14.png *
- tribes/empire/fisher/walk_e_15.png *
- tribes/empire/fisher/walk_e_16.png *
- tribes/empire/fisher/walk_e_17.png *
- tribes/empire/fisher/walk_e_18.png *
- tribes/empire/fisher/walk_e_19.png *
- tribes/empire/fisher/walk_ne_10.png *
- tribes/empire/fisher/walk_ne_11.png *
- tribes/empire/fisher/walk_ne_12.png *
- tribes/empire/fisher/walk_ne_13.png *
- tribes/empire/fisher/walk_ne_14.png *
- tribes/empire/fisher/walk_ne_15.png *
- tribes/empire/fisher/walk_ne_16.png *
- tribes/empire/fisher/walk_ne_17.png *
- tribes/empire/fisher/walk_ne_18.png *
- tribes/empire/fisher/walk_ne_19.png *
- tribes/empire/fisher/walk_nw_10.png *
- tribes/empire/fisher/walk_nw_11.png *
- tribes/empire/fisher/walk_nw_12.png *
- tribes/empire/fisher/walk_nw_13.png *
- tribes/empire/fisher/walk_nw_14.png *
- tribes/empire/fisher/walk_nw_15.png *
- tribes/empire/fisher/walk_nw_16.png *
- tribes/empire/fisher/walk_nw_17.png *
- tribes/empire/fisher/walk_nw_18.png *
- tribes/empire/fisher/walk_nw_19.png *
- tribes/empire/fisher/walk_se_10.png *
- tribes/empire/fisher/walk_se_11.png *
- tribes/empire/fisher/walk_se_12.png *
- tribes/empire/fisher/walk_se_13.png *
- tribes/empire/fisher/walk_se_14.png *
- tribes/empire/fisher/walk_se_15.png *
- tribes/empire/fisher/walk_se_16.png *
- tribes/empire/fisher/walk_se_17.png *
- tribes/empire/fisher/walk_se_18.png *
- tribes/empire/fisher/walk_se_19.png *
- tribes/empire/fisher/walk_sw_10.png *
- tribes/empire/fisher/walk_sw_11.png *
- tribes/empire/fisher/walk_sw_12.png *
- tribes/empire/fisher/walk_sw_13.png *
- tribes/empire/fisher/walk_sw_14.png *
- tribes/empire/fisher/walk_sw_15.png *
- tribes/empire/fisher/walk_sw_16.png *
- tribes/empire/fisher/walk_sw_17.png *
- tribes/empire/fisher/walk_sw_18.png *
- tribes/empire/fisher/walk_sw_19.png *
- tribes/empire/fisher/walk_w_10.png *
- tribes/empire/fisher/walk_w_11.png *
- tribes/empire/fisher/walk_w_12.png *
- tribes/empire/fisher/walk_w_13.png *
- tribes/empire/fisher/walk_w_14.png *
- tribes/empire/fisher/walk_w_15.png *
- tribes/empire/fisher/walk_w_16.png *
- tribes/empire/fisher/walk_w_17.png *
- tribes/empire/fisher/walk_w_18.png *
- tribes/empire/fisher/walk_w_19.png *
- tribes/empire/weaponsmithy/weaponsmith_i_00.png *
added
removed
src/scripting/doc/source/auxiliary.rst
