fix reversions after merge

This commit is contained in:
zzz
2011-03-02 18:31:48 +00:00
parent 9030b64dc8
commit b2d4a799d5
4 changed files with 5 additions and 5 deletions

View File

@ -1,5 +1,5 @@
<div lang="en"> <div lang="en">
<div class="welcome">
<div class="langbox"> <div class="langbox">
<a href="/?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a> <a href="/?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a>
<a href="/?lang=ar"><img src="/flags.jsp?c=lang_ar" title="عربية" alt="عربية"></a> <a href="/?lang=ar"><img src="/flags.jsp?c=lang_ar" title="عربية" alt="عربية"></a>
@ -11,7 +11,7 @@
<a href="/?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a>
<a href="/?lang=ru"><img src="/flags.jsp?c=ru" title="Русский" alt="Русский"></a> <a href="/?lang=ru"><img src="/flags.jsp?c=ru" title="Русский" alt="Русский"></a>
<a href="/?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a> <a href="/?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a>
</div>
<a name="top"></a> <a name="top"></a>
<h2>Welcome to the Invisible Internet</h2> <h2>Welcome to the Invisible Internet</h2>
</div> </div>

View File

@ -790,7 +790,7 @@ button:active {
} }
.langbox { .langbox {
margin: 4px 2px 2px 5px; margin: 8px 2px 2px 5px;
padding: 7px 10px 5px 10px; padding: 7px 10px 5px 10px;
color: #EE9; color: #EE9;
font-size: 7pt; font-size: 7pt;

View File

@ -851,7 +851,7 @@ button:active{
} }
.langbox { .langbox {
margin: 4px 10px 4px 5px; margin: 7px 10px 4px 5px;
padding: 8px 5px; padding: 8px 5px;
color: #001; color: #001;
font-size: 7pt; font-size: 7pt;

View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 1; public final static long BUILD = 2;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";