]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61ec868 83f2274)
Merge branch 'm0rfar/wtf'
authorRudolf Polzer <rpolzer@grawp.(none)>
Fri, 2 Apr 2010 19:16:02 +0000 (21:16 +0200)
committerRudolf Polzer <rpolzer@grawp.(none)>
Fri, 2 Apr 2010 19:16:02 +0000 (21:16 +0200)
Conflicts:
env/exosystem/exosystem2_bk.tga
env/exosystem/exosystem2_dn.tga
env/exosystem/exosystem2_ft.tga
env/exosystem/exosystem2_lf.tga
env/exosystem/exosystem2_preview.png
env/exosystem/exosystem2_rt.tga
env/exosystem/exosystem2_up.tga
env/exosystem/exosystem_bk.tga
env/exosystem/exosystem_dn.tga
env/exosystem/exosystem_ft.tga
env/exosystem/exosystem_lf.tga
env/exosystem/exosystem_preview.png
env/exosystem/exosystem_rt.tga
env/exosystem/exosystem_up.tga


Trivial merge