Gnosygnu has uploaded a new change for review.
https://gerrit.wikimedia.org/r/80952
Change subject: I2443700370c3679e6db3aab3845efd7d00bca7d1
......................................................................
I2443700370c3679e6db3aab3845efd7d00bca7d1
Change-Id: Idccf1e5aa6a38c9413c997d89cb650d386729283
---
M .metadata/.log
M .metadata/.plugins/org.eclipse.core.resources/.projects/100_core/.markers
M
.metadata/.plugins/org.eclipse.core.resources/.projects/100_core/org.eclipse.jdt.core/state.dat
M .metadata/.plugins/org.eclipse.core.resources/.projects/110_gfml/.markers
M
.metadata/.plugins/org.eclipse.core.resources/.projects/110_gfml/org.eclipse.jdt.core/state.dat
M .metadata/.plugins/org.eclipse.core.resources/.projects/140_dbs/.markers
M
.metadata/.plugins/org.eclipse.core.resources/.projects/140_dbs/org.eclipse.jdt.core/state.dat
M .metadata/.plugins/org.eclipse.core.resources/.projects/150_gfui/.markers
M
.metadata/.plugins/org.eclipse.core.resources/.projects/150_gfui/org.eclipse.jdt.core/state.dat
M .metadata/.plugins/org.eclipse.core.resources/.projects/400_xowa/.markers
M
.metadata/.plugins/org.eclipse.core.resources/.projects/400_xowa/org.eclipse.jdt.core/state.dat
M .metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
M
.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
M
.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
M .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
M .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
M .metadata/.plugins/org.eclipse.jdt.launching/.install.xml
M .metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
M .metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
M .metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
M .metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
M .metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
M .metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
M .metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
24 files changed, 25 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/xowa refs/changes/52/80952/1
diff --git a/.metadata/.log b/.metadata/.log
index 8c1f80a..6522cfd 100644
--- a/.metadata/.log
+++ b/.metadata/.log
@@ -481,7 +481,7 @@
!ENTRY org.eclipse.jdt.core 4 0 2013-03-06 20:41:57.796
!MESSAGE Invalid ZIP archive: lib/swt.jar [in 150_gfui]
-<<<<<<< HEAD (d75126 initial commit:2013-08-26)
+<<<<<<< HEAD
=======
!SESSION 2013-08-25 22:58:47.491
-----------------------------------------------
eclipse.buildId=M20120208-0800
@@ -909,4 +909,4 @@
!MESSAGE Could not find view: com.android.ide.eclipse.ddms.views.LogCatView
!SUBENTRY 1 unknown 0 0 2013-08-25 22:59:03.162
!MESSAGE OK
->>>>>>> BRANCH (084463 initial commit:2013-08-26)
+>>>>>>> 08446399ad3aacf564be7bf1246f5461be88f3a1
diff --git
a/.metadata/.plugins/org.eclipse.core.resources/.projects/100_core/.markers
b/.metadata/.plugins/org.eclipse.core.resources/.projects/100_core/.markers
index 41dcf37..720e247 100644
--- a/.metadata/.plugins/org.eclipse.core.resources/.projects/100_core/.markers
+++ b/.metadata/.plugins/org.eclipse.core.resources/.projects/100_core/.markers
Binary files differ
diff --git
a/.metadata/.plugins/org.eclipse.core.resources/.projects/100_core/org.eclipse.jdt.core/state.dat
b/.metadata/.plugins/org.eclipse.core.resources/.projects/100_core/org.eclipse.jdt.core/state.dat
index 97d7e1f..336c566 100644
---
a/.metadata/.plugins/org.eclipse.core.resources/.projects/100_core/org.eclipse.jdt.core/state.dat
+++
b/.metadata/.plugins/org.eclipse.core.resources/.projects/100_core/org.eclipse.jdt.core/state.dat
Binary files differ
diff --git
a/.metadata/.plugins/org.eclipse.core.resources/.projects/110_gfml/.markers
b/.metadata/.plugins/org.eclipse.core.resources/.projects/110_gfml/.markers
index 2d5f865..cb1190c 100644
--- a/.metadata/.plugins/org.eclipse.core.resources/.projects/110_gfml/.markers
+++ b/.metadata/.plugins/org.eclipse.core.resources/.projects/110_gfml/.markers
Binary files differ
diff --git
a/.metadata/.plugins/org.eclipse.core.resources/.projects/110_gfml/org.eclipse.jdt.core/state.dat
b/.metadata/.plugins/org.eclipse.core.resources/.projects/110_gfml/org.eclipse.jdt.core/state.dat
index cdebb73..fc03cca 100644
---
a/.metadata/.plugins/org.eclipse.core.resources/.projects/110_gfml/org.eclipse.jdt.core/state.dat
+++
b/.metadata/.plugins/org.eclipse.core.resources/.projects/110_gfml/org.eclipse.jdt.core/state.dat
Binary files differ
diff --git
a/.metadata/.plugins/org.eclipse.core.resources/.projects/140_dbs/.markers
b/.metadata/.plugins/org.eclipse.core.resources/.projects/140_dbs/.markers
index a18c08b..69502a1 100644
--- a/.metadata/.plugins/org.eclipse.core.resources/.projects/140_dbs/.markers
+++ b/.metadata/.plugins/org.eclipse.core.resources/.projects/140_dbs/.markers
Binary files differ
diff --git
a/.metadata/.plugins/org.eclipse.core.resources/.projects/140_dbs/org.eclipse.jdt.core/state.dat
b/.metadata/.plugins/org.eclipse.core.resources/.projects/140_dbs/org.eclipse.jdt.core/state.dat
index a28cfb0..b6b1d46 100644
---
a/.metadata/.plugins/org.eclipse.core.resources/.projects/140_dbs/org.eclipse.jdt.core/state.dat
+++
b/.metadata/.plugins/org.eclipse.core.resources/.projects/140_dbs/org.eclipse.jdt.core/state.dat
Binary files differ
diff --git
a/.metadata/.plugins/org.eclipse.core.resources/.projects/150_gfui/.markers
b/.metadata/.plugins/org.eclipse.core.resources/.projects/150_gfui/.markers
index f9a18fb..eb3bc09 100644
--- a/.metadata/.plugins/org.eclipse.core.resources/.projects/150_gfui/.markers
+++ b/.metadata/.plugins/org.eclipse.core.resources/.projects/150_gfui/.markers
Binary files differ
diff --git
a/.metadata/.plugins/org.eclipse.core.resources/.projects/150_gfui/org.eclipse.jdt.core/state.dat
b/.metadata/.plugins/org.eclipse.core.resources/.projects/150_gfui/org.eclipse.jdt.core/state.dat
index 3295a3f..78f90c9 100644
---
a/.metadata/.plugins/org.eclipse.core.resources/.projects/150_gfui/org.eclipse.jdt.core/state.dat
+++
b/.metadata/.plugins/org.eclipse.core.resources/.projects/150_gfui/org.eclipse.jdt.core/state.dat
Binary files differ
diff --git
a/.metadata/.plugins/org.eclipse.core.resources/.projects/400_xowa/.markers
b/.metadata/.plugins/org.eclipse.core.resources/.projects/400_xowa/.markers
index 5812ee2..0721aeb 100644
--- a/.metadata/.plugins/org.eclipse.core.resources/.projects/400_xowa/.markers
+++ b/.metadata/.plugins/org.eclipse.core.resources/.projects/400_xowa/.markers
Binary files differ
diff --git
a/.metadata/.plugins/org.eclipse.core.resources/.projects/400_xowa/org.eclipse.jdt.core/state.dat
b/.metadata/.plugins/org.eclipse.core.resources/.projects/400_xowa/org.eclipse.jdt.core/state.dat
index 9eb31a1..6e26e49 100644
---
a/.metadata/.plugins/org.eclipse.core.resources/.projects/400_xowa/org.eclipse.jdt.core/state.dat
+++
b/.metadata/.plugins/org.eclipse.core.resources/.projects/400_xowa/org.eclipse.jdt.core/state.dat
Binary files differ
diff --git
a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
index cb48187..acbfefb 100644
---
a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
+++
b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
Binary files differ
diff --git
a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
index 5fbc4fc..3a49a3f 100644
---
a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
+++
b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
Binary files differ
diff --git
a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
index 56e39f5..c8bb9b7 100644
---
a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
+++
b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
@@ -1,7 +1,7 @@
-<<<<<<< HEAD (d75126 initial commit:2013-08-26)
+<<<<<<< HEAD
eclipse.preferences.version=1
org.eclipse.jdt.launching.PREF_VM_XML=<?xml version\="1.0" encoding\="UTF-8"
standalone\="no"?>\r\n<vmSettings
defaultVM\="57,org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType13,1356505231515"
defaultVMConnector\="">\r\n<vmType
id\="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType">\r\n<vm
id\="1356505231515" name\="100_jre_1_6"
path\="C\:\\000\\100_bin\\100_os\\200_runtime\\100_java\\100_jre_1_6"/>\r\n</vmType>\r\n</vmSettings>\r\n
=======
eclipse.preferences.version=1
org.eclipse.jdt.launching.PREF_VM_XML=<?xml version\="1.0" encoding\="UTF-8"
standalone\="no"?>\n<vmSettings
defaultVM\="57,org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType13,1377485955217"
defaultVMConnector\="">\n<vmType
id\="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType">\n<vm
id\="1377485955217" name\="java-7-openjdk-i386"
path\="/usr/lib/jvm/java-7-openjdk-i386"/>\n</vmType>\n</vmSettings>\n
->>>>>>> BRANCH (084463 initial commit:2013-08-26)
+>>>>>>> 08446399ad3aacf564be7bf1246f5461be88f3a1
diff --git
a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
index 7efb52c..5c21e0c 100644
---
a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
+++
b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
@@ -1,4 +1,4 @@
-<<<<<<< HEAD (d75126 initial commit:2013-08-26)
+<<<<<<< HEAD
content_assist_disabled_computers=org.eclipse.jdt.ui.javaAllProposalCategory\u0000org.eclipse.jdt.ui.javaNoTypeProposalCategory\u0000org.eclipse.jdt.ui.textProposalCategory\u0000org.eclipse.jdt.ui.javaTypeProposalCategory\u0000
content_assist_lru_history=<?xml version\="1.0" encoding\="UTF-8"
standalone\="no"?><history maxLHS\="100" maxRHS\="10"/>
content_assist_number_of_computers=21
@@ -56,4 +56,4 @@
tabWidthPropagated=true
useAnnotationsPrefPage=true
useQuickDiffPrefPage=true
->>>>>>> BRANCH (084463 initial commit:2013-08-26)
+>>>>>>> 08446399ad3aacf564be7bf1246f5461be88f3a1
diff --git
a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
index e525a03..1627d5d 100644
---
a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
+++
b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
@@ -1,4 +1,4 @@
-<<<<<<< HEAD (d75126 initial commit:2013-08-26)
+<<<<<<< HEAD
EXIT_PROMPT_ON_CLOSE_LAST_WINDOW=false
PROBLEMS_FILTERS_MIGRATE=true
eclipse.preferences.version=1
@@ -12,4 +12,4 @@
platformState=1359935932904
quickStart=false
tipsAndTricks=true
->>>>>>> BRANCH (084463 initial commit:2013-08-26)
+>>>>>>> 08446399ad3aacf564be7bf1246f5461be88f3a1
diff --git a/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
b/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
index 591c4a9..6ab9622 100644
--- a/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
+++ b/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
@@ -1,4 +1,4 @@
-<<<<<<< HEAD (d75126 initial commit:2013-08-26)
+<<<<<<< HEAD
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<dirs>
<entry loc="C:\000\100_bin\100_os\200_runtime\100_java\100_jre_1_6"
stamp="1338856020359"/>
@@ -9,4 +9,4 @@
<entry loc="/usr/lib/jvm/java-7-openjdk-i386" stamp="1360105805000"/>
<entry loc="C:\000\100_bin\100_os\200_runtime\100_java\100_jre_1_6"
stamp="1338856020359"/>
</dirs>
->>>>>>> BRANCH (084463 initial commit:2013-08-26)
+>>>>>>> 08446399ad3aacf564be7bf1246f5461be88f3a1
diff --git a/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
b/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
index cdc152a..3d20dca 100644
--- a/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
+++ b/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
@@ -1,4 +1,4 @@
-<<<<<<< HEAD (d75126 initial commit:2013-08-26)
+<<<<<<< HEAD
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<libraryInfos>
<libraryInfo home="C:\000\100_bin\100_os\200_runtime\100_java\100_jre_1_6"
version="1.6.0_32">
@@ -88,4 +88,4 @@
</endorsedDirs>
</libraryInfo>
</libraryInfos>
->>>>>>> BRANCH (084463 initial commit:2013-08-26)
+>>>>>>> 08446399ad3aacf564be7bf1246f5461be88f3a1
diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
b/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
index 4e3d0eb..09374b1 100644
--- a/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
+++ b/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
@@ -1,7 +1,7 @@
-<<<<<<< HEAD (d75126 initial commit:2013-08-26)
+<<<<<<< HEAD
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<typeInfoHistroy/>
=======
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<typeInfoHistroy/>
->>>>>>> BRANCH (084463 initial commit:2013-08-26)
+>>>>>>> 08446399ad3aacf564be7bf1246f5461be88f3a1
diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
b/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
index 12e7235..e0afac2 100644
--- a/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
+++ b/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
@@ -1,7 +1,7 @@
-<<<<<<< HEAD (d75126 initial commit:2013-08-26)
+<<<<<<< HEAD
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<qualifiedTypeNameHistroy/>
=======
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<qualifiedTypeNameHistroy/>
->>>>>>> BRANCH (084463 initial commit:2013-08-26)
+>>>>>>> 08446399ad3aacf564be7bf1246f5461be88f3a1
diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
b/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
index 550f07a..6e43b49 100644
--- a/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
+++ b/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
@@ -1,4 +1,4 @@
-<<<<<<< HEAD (d75126 initial commit:2013-08-26)
+<<<<<<< HEAD
<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
<item value="filter_imports;" key="filters_last_used"/>
@@ -140,4 +140,4 @@
<item value="true"
key="org.eclipse.jdt.internal.ui.typehierarchy.HierarchyInformationControlDIALOG_USE_PERSISTED_SIZE"/>
</section>
</section>
->>>>>>> BRANCH (084463 initial commit:2013-08-26)
+>>>>>>> 08446399ad3aacf564be7bf1246f5461be88f3a1
diff --git
a/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
b/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
index c971fec..e76cdf1 100644
--- a/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
+++ b/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
@@ -1,7 +1,7 @@
-<<<<<<< HEAD (d75126 initial commit:2013-08-26)
+<<<<<<< HEAD
#Cached timestamps
#Sun Jun 16 12:23:48 EDT 2013
=======
#Cached timestamps
#Sun Aug 25 23:00:52 EDT 2013
->>>>>>> BRANCH (084463 initial commit:2013-08-26)
+>>>>>>> 08446399ad3aacf564be7bf1246f5461be88f3a1
diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
b/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
index 9c0e3d7..4a78bf4 100644
--- a/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
+++ b/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
@@ -1,4 +1,4 @@
-<<<<<<< HEAD (d75126 initial commit:2013-08-26)
+<<<<<<< HEAD
<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
<section name="org.eclipse.ui.internal.QuickAccess">
@@ -74,4 +74,4 @@
</list>
</section>
</section>
->>>>>>> BRANCH (084463 initial commit:2013-08-26)
+>>>>>>> 08446399ad3aacf564be7bf1246f5461be88f3a1
diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
b/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
index 8644de3..244a5d6 100644
--- a/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
+++ b/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
@@ -1,4 +1,4 @@
-<<<<<<< HEAD (d75126 initial commit:2013-08-26)
+<<<<<<< HEAD
<?xml version="1.0" encoding="UTF-8"?>
<workbench progressCount="15" version="2.0">
<workbenchAdvisor/>
@@ -1234,5 +1234,5 @@
</trimLayout>
</window>
<mruList/>
->>>>>>> BRANCH (084463 initial commit:2013-08-26)
-</workbench>
+>>>>>>> 08446399ad3aacf564be7bf1246f5461be88f3a1
+</workbench>
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/80952
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idccf1e5aa6a38c9413c997d89cb650d386729283
Gerrit-PatchSet: 1
Gerrit-Project: xowa
Gerrit-Branch: master
Gerrit-Owner: Gnosygnu <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
