Date: Monday, August 5, 2013 @ 19:01:03 Author: arodseth Revision: 95098
Resolved conflicts Added: freeorion/repos/community-i686/PKGBUILD (from rev 95097, freeorion/trunk/PKGBUILD) freeorion/repos/community-i686/cmake_python.patch (from rev 95097, freeorion/trunk/cmake_python.patch) freeorion/repos/community-i686/freeorion.install (from rev 95097, freeorion/trunk/freeorion.install) freeorion/repos/community-i686/freeorion.sh (from rev 95097, freeorion/trunk/freeorion.sh) freeorion/repos/community-x86_64/PKGBUILD (from rev 95097, freeorion/trunk/PKGBUILD) freeorion/repos/community-x86_64/cmake_python.patch (from rev 95097, freeorion/trunk/cmake_python.patch) freeorion/repos/community-x86_64/freeorion.install (from rev 95097, freeorion/trunk/freeorion.install) freeorion/repos/community-x86_64/freeorion.sh (from rev 95097, freeorion/trunk/freeorion.sh) Deleted: freeorion/repos/community-i686/PKGBUILD freeorion/repos/community-i686/cmake_python.patch freeorion/repos/community-i686/freeorion.install freeorion/repos/community-i686/freeorion.sh freeorion/repos/community-x86_64/PKGBUILD freeorion/repos/community-x86_64/cmake_python.patch freeorion/repos/community-x86_64/freeorion.install freeorion/repos/community-x86_64/freeorion.sh -------------------------------------+ /PKGBUILD | 232 +++++++++++++++++++++++++++ /cmake_python.patch | 46 +++++ /freeorion.install | 26 +++ /freeorion.sh | 286 ++++++++++++++++++++++++++++++++++ community-i686/PKGBUILD | 118 -------------- community-i686/cmake_python.patch | 23 -- community-i686/freeorion.install | 13 - community-i686/freeorion.sh | 143 ----------------- community-x86_64/PKGBUILD | 118 -------------- community-x86_64/cmake_python.patch | 23 -- community-x86_64/freeorion.install | 13 - community-x86_64/freeorion.sh | 143 ----------------- 12 files changed, 590 insertions(+), 594 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 95097:95098 to see the changes.