[rbdoom3bfg] 02/02: Merge tag 'upstream/1.0.2_git20150215+repack2'

[Tobias Frost]

This is an automated email from the git hooks/post-receive script.

tobi pushed a commit to branch master
in repository rbdoom3bfg.

commit c2384da7b28969a29402ace43e8bd643beef469a
Merge: 4590358 1b1f59a
Author: Tobias Frost <tobi at coldtobi.de>
Date:   Sun Feb 15 18:53:21 2015 +0100

    Merge tag 'upstream/1.0.2_git20150215+repack2'
    
    Upstream version 1.0.2~git20150215+repack2

 debian/changelog  |   4 ++--
 neo/astyle.x86    | Bin 276644 -> 0 bytes
 neo/astyle.x86_64 | Bin 344208 -> 0 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 850d2fa,0000000..e90060e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,5 @@@
- rbdoom3bfg (1.0.2~git20150215+repack-1) unstable; urgency=low
++rbdoom3bfg (1.0.2~git20150215+repack2-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #764200)
 +
-  -- Tobias Frost <tobi at debian.org>  Sat, 06 Dec 2014 15:47:38 +0100
++ -- Tobias Frost <tobi at debian.org>  Sun, 15 Feb 2015 19:18:42 +0100

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git