This commit is contained in:
Cestaberous
2015-06-05 10:51:33 -05:00
409 changed files with 30290 additions and 0 deletions

View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
<section name="org.eclipse.ui.internal.QuickAccess">
<<<<<<< HEAD
<item value="853" key="dialogWidth"/>
<item value="480" key="dialogHeight"/>
<list key="orderedProviders">
@@ -10,6 +11,17 @@
<list key="orderedElements">
</list>
<list key="textEntries">
=======
<item value="474" key="dialogHeight"/>
<item value="847" key="dialogWidth"/>
<list key="textEntries">
</list>
<list key="orderedElements">
</list>
<list key="orderedProviders">
</list>
<list key="textArray">
>>>>>>> e3b5f5f77f61b7a685fc1fc9109f8de395ab933d
</list>
</section>
</section>

View File

@@ -1,4 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<workingSetManager>
<<<<<<< HEAD
<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1433516553829_0" label="Window Working Set" name="Aggregate for window 1433516553827"/>
=======
<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1426777548331_0" label="Window Working Set" name="Aggregate for window 1426777548317"/>
>>>>>>> e3b5f5f77f61b7a685fc1fc9109f8de395ab933d
</workingSetManager>