projects
/
people
/
teissler
/
ipfire-2.x.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1e1cdd5
eead8d2
)
Merge remote-tracking branch 'origin/next' into thirteen
author
Arne Fitzenreiter
<arne_f@ipfire.org>
Sat, 3 Nov 2012 16:04:23 +0000
(17:04 +0100)
committer
Arne Fitzenreiter
<arne_f@ipfire.org>
Sat, 3 Nov 2012 16:04:23 +0000
(17:04 +0100)
Conflicts:
make.sh
1
2
make.sh
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
make.sh
index
59b8d51
,
f52f9e8
..
55684d5
---
1
/
make.sh
---
2
/
make.sh
+++ b/
make.sh
@@@
-24,8
-24,8
+24,8
@@@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
-VERSION="2.1
1
" # Version number
+VERSION="2.1
3
" # Version number
- CORE="6
3
" # Core Level (Filename)
+ CORE="6
4
" # Core Level (Filename)
PAKFIRE_CORE="63" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan