diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-21 02:22:44 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-21 02:22:44 -0400 |
commit | 03fa7e4f27bdb39a8f8f5ed91a87d18bf8357b47 (patch) | |
tree | c67eafcbda55706f18400b3115a2b8a5be318394 /public/static/logos/legacy | |
parent | 91c451821ce7000cbc268cec8427d208a6cedd7e (diff) | |
parent | b8ee7b1ee281b45b245fb454228b8ad847c56200 (diff) |
Merge branch 'archweb' into archweb-generic2
Conflicts:
devel/views.py
feeds.py
public/views.py
settings.py
sitestatic/archweb.js
templates/base.html
templates/devel/profile.html
templates/mirrors/status.html
templates/news/view.html
templates/packages/flaghelp.html
templates/packages/opensearch.xml
templates/public/download.html
templates/public/feeds.html
templates/public/index.html
templates/registration/login.html
templates/releng/results.html
templates/todolists/public_list.html
Diffstat (limited to 'public/static/logos/legacy')
17 files changed, 0 insertions, 0 deletions
diff --git a/public/static/logos/legacy/arch-legacy-aqua-blue.png b/public/static/logos/legacy/arch-legacy-aqua-blue.png Binary files differindex 9637ce72..4bbb215d 100644 --- a/public/static/logos/legacy/arch-legacy-aqua-blue.png +++ b/public/static/logos/legacy/arch-legacy-aqua-blue.png diff --git a/public/static/logos/legacy/arch-legacy-aqua-white.png b/public/static/logos/legacy/arch-legacy-aqua-white.png Binary files differindex 25fe9001..68ae73b6 100644 --- a/public/static/logos/legacy/arch-legacy-aqua-white.png +++ b/public/static/logos/legacy/arch-legacy-aqua-white.png diff --git a/public/static/logos/legacy/arch-legacy-aqua.png b/public/static/logos/legacy/arch-legacy-aqua.png Binary files differindex 881e1709..8cc7da47 100644 --- a/public/static/logos/legacy/arch-legacy-aqua.png +++ b/public/static/logos/legacy/arch-legacy-aqua.png diff --git a/public/static/logos/legacy/arch-legacy-blue1.png b/public/static/logos/legacy/arch-legacy-blue1.png Binary files differindex 3ed6c248..403a0661 100644 --- a/public/static/logos/legacy/arch-legacy-blue1.png +++ b/public/static/logos/legacy/arch-legacy-blue1.png diff --git a/public/static/logos/legacy/arch-legacy-blue2.png b/public/static/logos/legacy/arch-legacy-blue2.png Binary files differindex 8b5b791e..809ad4f0 100644 --- a/public/static/logos/legacy/arch-legacy-blue2.png +++ b/public/static/logos/legacy/arch-legacy-blue2.png diff --git a/public/static/logos/legacy/arch-legacy-noodle-blue.png b/public/static/logos/legacy/arch-legacy-noodle-blue.png Binary files differindex b24d34cf..cf7c00ed 100644 --- a/public/static/logos/legacy/arch-legacy-noodle-blue.png +++ b/public/static/logos/legacy/arch-legacy-noodle-blue.png diff --git a/public/static/logos/legacy/arch-legacy-noodle-box.png b/public/static/logos/legacy/arch-legacy-noodle-box.png Binary files differindex 1162ed64..78d76a6a 100644 --- a/public/static/logos/legacy/arch-legacy-noodle-box.png +++ b/public/static/logos/legacy/arch-legacy-noodle-box.png diff --git a/public/static/logos/legacy/arch-legacy-noodle-cup.png b/public/static/logos/legacy/arch-legacy-noodle-cup.png Binary files differindex b4f93078..c62cceee 100644 --- a/public/static/logos/legacy/arch-legacy-noodle-cup.png +++ b/public/static/logos/legacy/arch-legacy-noodle-cup.png diff --git a/public/static/logos/legacy/arch-legacy-noodle-white.png b/public/static/logos/legacy/arch-legacy-noodle-white.png Binary files differindex a12ee21c..04c17c53 100644 --- a/public/static/logos/legacy/arch-legacy-noodle-white.png +++ b/public/static/logos/legacy/arch-legacy-noodle-white.png diff --git a/public/static/logos/legacy/arch-legacy-ribbon1.png b/public/static/logos/legacy/arch-legacy-ribbon1.png Binary files differindex fb8e7720..dba79302 100644 --- a/public/static/logos/legacy/arch-legacy-ribbon1.png +++ b/public/static/logos/legacy/arch-legacy-ribbon1.png diff --git a/public/static/logos/legacy/arch-legacy-ribbon2.png b/public/static/logos/legacy/arch-legacy-ribbon2.png Binary files differindex 66635999..eccd61be 100644 --- a/public/static/logos/legacy/arch-legacy-ribbon2.png +++ b/public/static/logos/legacy/arch-legacy-ribbon2.png diff --git a/public/static/logos/legacy/arch-legacy-ribbon3.png b/public/static/logos/legacy/arch-legacy-ribbon3.png Binary files differindex c3c00b85..df412335 100644 --- a/public/static/logos/legacy/arch-legacy-ribbon3.png +++ b/public/static/logos/legacy/arch-legacy-ribbon3.png diff --git a/public/static/logos/legacy/arch-legacy-ribbon4.png b/public/static/logos/legacy/arch-legacy-ribbon4.png Binary files differindex 33a78edf..8f0ed3a0 100644 --- a/public/static/logos/legacy/arch-legacy-ribbon4.png +++ b/public/static/logos/legacy/arch-legacy-ribbon4.png diff --git a/public/static/logos/legacy/arch-legacy-ribbon5.png b/public/static/logos/legacy/arch-legacy-ribbon5.png Binary files differindex abf7cce4..e48dc537 100644 --- a/public/static/logos/legacy/arch-legacy-ribbon5.png +++ b/public/static/logos/legacy/arch-legacy-ribbon5.png diff --git a/public/static/logos/legacy/arch-legacy-ribbon6.png b/public/static/logos/legacy/arch-legacy-ribbon6.png Binary files differindex 9f275f22..c3091240 100644 --- a/public/static/logos/legacy/arch-legacy-ribbon6.png +++ b/public/static/logos/legacy/arch-legacy-ribbon6.png diff --git a/public/static/logos/legacy/arch-legacy-wombat-lg.png b/public/static/logos/legacy/arch-legacy-wombat-lg.png Binary files differindex 0661b6f5..661ec0a9 100644 --- a/public/static/logos/legacy/arch-legacy-wombat-lg.png +++ b/public/static/logos/legacy/arch-legacy-wombat-lg.png diff --git a/public/static/logos/legacy/arch-legacy-wombat.png b/public/static/logos/legacy/arch-legacy-wombat.png Binary files differindex 67e1afac..52678145 100644 --- a/public/static/logos/legacy/arch-legacy-wombat.png +++ b/public/static/logos/legacy/arch-legacy-wombat.png |