windows crap
windows crap
Merge branch 'master' of https://github.com/doktaphex/Project

Conflicts:

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/GForceMeter/.indexes/50/history.index

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/GForceMeter/.indexes/7/26/history.index

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/GForceMeter/.indexes/properties.index

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/GForceMeter/1.tree

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/GForceMeter/org.eclipse.egit.core/GitProjectData.properties

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/GForceMeter/org.eclipse.jdt.core/state.dat

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/IncomingCallNotifier/.indexes/50/history.index

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/IncomingCallNotifier/.indexes/7/26/history.index

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/IncomingCallNotifier/.indexes/properties.index

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/IncomingCallNotifier/.markers

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/IncomingCallNotifier/1.tree

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/IncomingCallNotifier/org.eclipse.egit.core/GitProjectData.properties

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/IncomingCallNotifier/org.eclipse.jdt.core/state.dat

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/RemoteSystemsTempFiles/.markers.snap

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/RemoteSystemsTempFiles/org.eclipse.egit.core/GitProjectData.properties

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/SMSilence/1.tree

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/SMSilence/org.eclipse.jdt.core/state.dat

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/SMSilenceFrags/.indexes/50/history.index

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/SMSilenceFrags/.indexes/7/26/history.index

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/SMSilenceFrags/.indexes/properties.index

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/SMSilenceFrags/.markers

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/SMSilenceFrags/.markers.snap

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/SMSilenceFrags/.syncinfo.snap

project_workspace/.metadata/.plugins/org.eclipse.core.resources/.project
s/SMSilenceFrags/org.eclipse.egit.core/GitProjectData.properties
	project_workspace/.metadata/.plugins/org.eclipse.core.resources/.snap

project_workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/
org.eclipse.egit.core.prefs

project_workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/
org.eclipse.jdt.launching.prefs

project_workspace/.metadata/.plugins/org.eclipse.jdt.core/1220216590.ind
ex

project_workspace/.metadata/.plugins/org.eclipse.jdt.core/1415874091.ind
ex

project_workspace/.metadata/.plugins/org.eclipse.jdt.core/429623930.inde
x

project_workspace/.metadata/.plugins/org.eclipse.jdt.launching/.install.
xml

project_workspace/.metadata/.plugins/org.eclipse.jdt.launching/libraryIn
fos.xml

project_workspace/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-c
ache.properties

project_workspace/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.
xml

project_workspace/.metadata/.plugins/org.eclipse.wst.jsdt.core/externalL
ibsTimeStamps

project_workspace/.metadata/.plugins/org.eclipse.wst.jsdt.core/libraries
/baseBrowserLibrary.js

project_workspace/.metadata/.plugins/org.eclipse.wst.jsdt.core/libraries
/browserWindow.js

project_workspace/.metadata/.plugins/org.eclipse.wst.jsdt.core/libraries
/dom5.js

project_workspace/.metadata/.plugins/org.eclipse.wst.jsdt.core/libraries
/system.js

project_workspace/.metadata/.plugins/org.eclipse.wst.jsdt.core/libraries
/xhr.js
	project_workspace1/SMSilenceFrags/.settings/org.eclipse.jdt.core.prefs
	project_workspace1/SMSilenceFrags/res/values/styles.xml