]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 2 Oct 2011 19:27:09 +0000 (21:27 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 2 Oct 2011 19:27:09 +0000 (21:27 +0200)
Conflicts:
lfs/libevent2
lfs/transmission
src/paks/transmission/install.sh
src/paks/transmission/uninstall.sh

1  2 
lfs/libevent2
make.sh

diff --cc lfs/libevent2
index 1fbc7db0912d09921a2f52b5b9e857ace8dab694,401ccbeaa3e37788f58b63e1fa36163f8e48fd6f..0756ab15c9aaed0918629799590cec9f03a38637
@@@ -62,7 -67,8 +67,9 @@@ $(patsubst %,$(DIR_DL)/%,$(objects)) 
  
  $(subst %,%_MD5,$(objects)) :
        @$(MD5)
 +
+ dist: 
+       @$(PAK)
  ###############################################################################
  # Installation Details
  ###############################################################################
diff --cc make.sh
Simple merge