Merge remote-tracking branch 'origin/matthiaskrgr/website'

Gaming / Games / Xonotic - Samual Lenks [xonotic.org] - 3 June 2013 13:43 EDT



###

Merge remote-tracking branch 'origin/matthiaskrgr/website'


deb8e46 Merge remote-tracking branch 'origin/matthiaskrgr/website'

Docs/basics.html | 297 --------------------
Docs/faq.html | 2 +-
Docs/htmlfiles/faq.aft | 2 +-
Docs/htmlfiles/weaponimg/crylink_1st.png | Bin 185851 -> 0 bytes
Docs/htmlfiles/weaponimg/crylink_1st_small.png | Bin 5906 -> 0 bytes
Docs/htmlfiles/weaponimg/crylink_3rd.png | Bin 59873 -> 0 bytes
Docs/htmlfiles/weaponimg/crylink_3rd_small.png | Bin 8188 -> 0 bytes
Docs/htmlfiles/weaponimg/electro_1st.png | Bin 242765 -> 0 bytes
Docs/htmlfiles/weaponimg/electro_1st_small.png | Bin 8302 -> 0 bytes
Docs/htmlfiles/weaponimg/electro_3rd.png | Bin 67780 -> 0 bytes
Docs/htmlfiles/weaponimg/electro_3rd_small.png | Bin 8622 -> 0 bytes
Docs/htmlfiles/weaponimg/fireball_1st.png | Bin 113361 -> 0 bytes
Docs/htmlfiles/weaponimg/fireball_1st_small.png | Bin 4719 -> 0 bytes
Docs/htmlfiles/weaponimg/fireball_3rd.png | Bin 72576 -> 0 bytes
Docs/htmlfiles/weaponimg/fireball_3rd_small.png | Bin 9185 -> 0 bytes
Docs/htmlfiles/weaponimg/grenadelauncher_1st.png | Bin 318622 -> 0 bytes
.../weaponimg/grenadelauncher_1st_small.png | Bin 8599 -> 0 bytes
Docs/htmlfiles/weaponimg/grenadelauncher_3rd.png | Bin 63581 -> 0 bytes
.../weaponimg/grenadelauncher_3rd_small.png | Bin 8261 -> 0 bytes
Docs/htmlfiles/weaponimg/hagar_1st.png | Bin 172485 -> 0 bytes
Docs/htmlfiles/weaponimg/hagar_1st_small.png | Bin 5425 -> 0 bytes
Docs/htmlfiles/weaponimg/hagar_3rd.png | Bin 57247 -> 0 bytes
Docs/htmlfiles/weaponimg/hagar_3rd_small.png | Bin 7698 -> 0 bytes
Docs/htmlfiles/weaponimg/hlac_1st.png | Bin 147457 -> 0 bytes
Docs/htmlfiles/weaponimg/hlac_1st_small.png | Bin 4352 -> 0 bytes
Docs/htmlfiles/weaponimg/hlac_3rd.png | Bin 65341 -> 0 bytes
Docs/htmlfiles/weaponimg/hlac_3rd_small.png | Bin 8398 -> 0 bytes
Docs/htmlfiles/weaponimg/hook_1st.png | Bin 128001 -> 0 bytes
Docs/htmlfiles/weaponimg/hook_1st_small.png | Bin 4153 -> 0 bytes
Docs/htmlfiles/weaponimg/hook_3rd.png | Bin 50696 -> 0 bytes
Docs/htmlfiles/weaponimg/hook_3rd_small.png | Bin 7287 -> 0 bytes
Docs/htmlfiles/weaponimg/laser_1st.png | Bin 82672 -> 0 bytes
Docs/htmlfiles/weaponimg/laser_1st_small.png | Bin 3122 -> 0 bytes
Docs/htmlfiles/weaponimg/laser_3rd.png | Bin 50433 -> 0 bytes
Docs/htmlfiles/weaponimg/laser_3rd_small.png | Bin 7312 -> 0 bytes
Docs/htmlfiles/weaponimg/minelayer_1st.png | Bin 137933 -> 0 bytes
Docs/htmlfiles/weaponimg/minelayer_1st_small.png | Bin 4754 -> 0 bytes
Docs/htmlfiles/weaponimg/minelayer_3rd.png | Bin 63355 -> 0 bytes
Docs/htmlfiles/weaponimg/minelayer_3rd_small.png | Bin 8493 -> 0 bytes
Docs/htmlfiles/weaponimg/minstanex_1st.png | Bin 145341 -> 0 bytes
Docs/htmlfiles/weaponimg/minstanex_1st_small.png | Bin 5687 -> 0 bytes
Docs/htmlfiles/weaponimg/minstanex_3rd.png | Bin 57102 -> 0 bytes
Docs/htmlfiles/weaponimg/minstanex_3rd_small.png | Bin 7743 -> 0 bytes
Docs/htmlfiles/weaponimg/nex_1st.png | Bin 279734 -> 0 bytes
Docs/htmlfiles/weaponimg/nex_1st_small.png | Bin 7272 -> 0 bytes
Docs/htmlfiles/weaponimg/nex_3rd.png | Bin 74028 -> 0 bytes
Docs/htmlfiles/weaponimg/nex_3rd_small.png | Bin 9105 -> 0 bytes
Docs/htmlfiles/weaponimg/porto_1st.png | Bin 157992 -> 0 bytes
Docs/htmlfiles/weaponimg/porto_1st_small.png | Bin 5133 -> 0 bytes
Docs/htmlfiles/weaponimg/porto_3rd.png | Bin 52533 -> 0 bytes
Docs/htmlfiles/weaponimg/porto_3rd_small.png | Bin 7407 -> 0 bytes
Docs/htmlfiles/weaponimg/rifle_1st.png | Bin 99869 -> 0 bytes
Docs/htmlfiles/weaponimg/rifle_1st_small.png | Bin 3965 -> 0 bytes
Docs/htmlfiles/weaponimg/rifle_3rd.png | Bin 52518 -> 0 bytes
Docs/htmlfiles/weaponimg/rifle_3rd_small.png | Bin 7567 -> 0 bytes
Docs/htmlfiles/weaponimg/rocketlauncher_1st.png | Bin 153730 -> 0 bytes
.../weaponimg/rocketlauncher_1st_small.png | Bin 5713 -> 0 bytes
Docs/htmlfiles/weaponimg/rocketlauncher_3rd.png | Bin 58890 -> 0 bytes
.../weaponimg/rocketlauncher_3rd_small.png | Bin 7934 -> 0 bytes
Docs/htmlfiles/weaponimg/seeker_1st.png | Bin 125484 -> 0 bytes
Docs/htmlfiles/weaponimg/seeker_1st_small.png | Bin 4389 -> 0 bytes
Docs/htmlfiles/weaponimg/seeker_3rd.png | Bin 78243 -> 0 bytes
Docs/htmlfiles/weaponimg/seeker_3rd_small.png | Bin 9334 -> 0 bytes
Docs/htmlfiles/weaponimg/shotgun_1st.png | Bin 114516 -> 0 bytes
Docs/htmlfiles/weaponimg/shotgun_1st_small.png | Bin 3727 -> 0 bytes
Docs/htmlfiles/weaponimg/shotgun_3rd.png | Bin 59333 -> 0 bytes
Docs/htmlfiles/weaponimg/shotgun_3rd_small.png | Bin 7950 -> 0 bytes
Docs/htmlfiles/weaponimg/tuba_1st.png | Bin 158082 -> 0 bytes
Docs/htmlfiles/weaponimg/tuba_1st_small.png | Bin 6787 -> 0 bytes
Docs/htmlfiles/weaponimg/tuba_3rd.png | Bin 71400 -> 0 bytes
Docs/htmlfiles/weaponimg/tuba_3rd_small.png | Bin 8941 -> 0 bytes
Docs/htmlfiles/weaponimg/uzi_1st.png | Bin 116283 -> 0 bytes
Docs/htmlfiles/weaponimg/uzi_1st_small.png | Bin 3695 -> 0 bytes
Docs/htmlfiles/weaponimg/uzi_3rd.png | Bin 59970 -> 0 bytes
Docs/htmlfiles/weaponimg/uzi_3rd_small.png | Bin 7940 -> 0 bytes
readme.html | 100 -------
76 files changed, 2 insertions(+), 399 deletions(-)

Upstream: git.xonotic.org


  • Share