r12246 - non-free/packages/trunk/assaultcube-data/debian

[Arand Nash]

Author: arand-guest
Date: 2011-05-08 20:58:18 +0000 (Sun, 08 May 2011)
New Revision: 12246

Added:
   non-free/packages/trunk/assaultcube-data/debian/assaultcube-server.6
   non-free/packages/trunk/assaultcube-data/debian/assaultcube.6
   non-free/packages/trunk/assaultcube-data/debian/assaultcube.manpages
Modified:
   non-free/packages/trunk/assaultcube-data/debian/changelog
   non-free/packages/trunk/assaultcube-data/debian/control
   non-free/packages/trunk/assaultcube-data/debian/copyright
   non-free/packages/trunk/assaultcube-data/debian/rules
   non-free/packages/trunk/assaultcube-data/debian/watch
Log:
Merge branch 'debian_clean' into svn_debian

Conflicts:
	debian/changelog
	debian/control
	debian/copyright
	debian/rules
	debian/watch

! The diff was too big and was omitted from this mail !
The command

svn diff -r 12245:12246 .

typed in the updated working copy will allow you to see the diff

Also this link should allow you to see the differences in a browser:

http://svn.debian.org/wsvn/pkg-games?op=comp&compare%5B%5D=%2F@12245&compare%5B%5D=%2F@12246