]> git.rm.cloudns.org Git - xonotic/xonotic.git/commit
./all compile: ignore merge conflicts. The compiler will tell anyway...
authorRudolf Polzer <divverent@alientrap.org>
Wed, 9 Mar 2011 17:25:37 +0000 (18:25 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 9 Mar 2011 17:25:37 +0000 (18:25 +0100)
commite32ac5f1d746f508841428ee68fd7625b17ef464
tree4da02c0a6ace541ad7e87b493d230cfd0987a8d7
parentc448e52f93e94881720b6be54e93eb023d944e6c
./all compile: ignore merge conflicts. The compiler will tell anyway...
all