Eclipse Merge

.metadata/.log

@@ -3726,3 +3726,46 @@ not correct please set the HOME environment variable and restart Eclipse. Otherw
 EGit might behave differently since they see different configuration options.
 This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
 >>>>>>> e40a7be4d40d3b005d6297e3fb78680697518ffe
+!SESSION 2014-04-16 20:22:24.774 -----------------------------------------------
+eclipse.buildId=4.3.0.I20130605-2000
+java.version=1.7.0_51
+java.vendor=Oracle Corporation
+BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=en_US
+Framework arguments:  -product org.eclipse.epp.package.standard.product
+Command-line arguments:  -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.standard.product
+
+!ENTRY org.eclipse.jface 2 0 2014-04-16 20:22:35.661
+!MESSAGE Keybinding conflicts occurred.  They may interfere with normal accelerator operation.
+!SUBENTRY 1 org.eclipse.jface 2 0 2014-04-16 20:22:35.661
+!MESSAGE A conflict occurred for ALT+CTRL+T:
+Binding(ALT+CTRL+T,
+	ParameterizedCommand(Command(org.eclipse.team.svn.ui.command.EditPropertiesCommand,Show Properties,
+		,
+		Category(org.eclipse.team.svn.ui.command.category,SVN,null,true),
+		org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@5107bbf0,
+		,,true),null),
+	org.eclipse.ui.defaultAcceleratorConfiguration,
+	org.eclipse.ui.contexts.window,,,system)
+Binding(ALT+CTRL+T,
+	ParameterizedCommand(Command(pl.szpinda.plugin.tomcat.commands.tomcatStartStop,Tomcat start,stop,
+		,
+		Category(pl.szpinda.plugin.tomcat.commands.category.key,Tomcat keys,null,true),
+		org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@52c3b31f,
+		,,true),null),
+	org.eclipse.ui.defaultAcceleratorConfiguration,
+	org.eclipse.ui.contexts.window,,,system)
+
+!ENTRY org.eclipse.egit.ui 2 0 2014-04-16 20:22:40.877
+!MESSAGE Warning: EGit couldn't detect the installation path "gitPrefix" of native Git. Hence EGit can't respect system level
+Git settings which might be configured in ${gitPrefix}/etc/gitconfig under the native Git installation directory.
+The most important of these settings is core.autocrlf. Git for Windows by default sets this parameter to true in
+this system level configuration. The Git installation location can be configured on the
+Team > Git > Configuration preference page's 'System Settings' tab.
+This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
+
+!ENTRY org.eclipse.egit.ui 2 0 2014-04-16 20:22:40.887
+!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git
+user global configuration and to define the default location to store repositories: 'U:\'. If this is
+not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and
+EGit might behave differently since they see different configuration options.
+This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.

.metadata/.plugins/org.eclipse.cdt.core/.log

@@ -14,3 +14,4 @@
 *** SESSION Apr 16, 2014 19:50:10.14 -------------------------------------------
 *** SESSION Apr 16, 2014 19:53:32.56 -------------------------------------------
 *** SESSION Apr 16, 2014 20:10:20.42 -------------------------------------------
+*** SESSION Apr 16, 2014 20:18:42.79 -------------------------------------------

.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt

@@ -10,10 +10,10 @@ INDEX VERSION 1.126+S:\cs227\workspace\.metadata\.plugins\org.eclipse.jdt.core
 299273985.index
 3159075286.index
 1995173708.index
+2720792536.index
 1299022128.index
 163172794.index
 1298693918.index
-2720792536.index
 2603447019.index
 1697886153.index
 1023576977.index
@@ -22,9 +22,9 @@ INDEX VERSION 1.126+S:\cs227\workspace\.metadata\.plugins\org.eclipse.jdt.core
 30765161.index
 980373384.index
 1131222373.index
-4108727661.index
 3563138724.index
 1554758791.index
+4108727661.index
 2317527368.index
 1115467115.index
 1104682234.index

.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml

-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<typeInfoHistroy/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<typeInfoHistroy>
+<typeInfo handle="=exam1/src&lt;exam2{Processor.java[Processor" modifiers="513" timestamp="1396835680236"/>
+</typeInfoHistroy>