Got doubleclick working in flash builder
deleting bin from cache
adding snippets feature project which got left out somehow
Merge branch 'master' of github.com:cfeclipse/cfeclipse
Merge pull request #2 from marcesher/master

flashbuilder support for standalone snippets
Merge branch 'master' of github.com:cfeclipse/cfeclipse
Changed action.label.CommentLines to action.label.CommentLine to match
the declaration in plugin.xml
Change cfcache to be a hybrid tag, since when action is get or put (and
possibly others) it is invalid to have a closing tag.
Merge pull request #3 from am2605/master

Fixed typo in plugin.properties
Made some progress in getting code completion in the arguments scope, and function completion on referenced CFCs
Merge pull request #5 from am2605/github-issue-4

Add completion for arguments within a function
Merge branch 'develop'

Conflicts:
	org.cfeclipse.cfml.snippets/src/org/cfeclipse/cfml/snippets/views/snips/SnipTreeView.java
	org.cfeclipse.cfml/src/org/cfeclipse/cfml/CFMLPlugin.java
	org.cfeclipse.cfml/src/org/cfeclipse/cfml/editors/contentassist/CFMLArgumentAssist.java
	org.cfeclipse.cfml/src/org/cfeclipse/cfml/editors/contentassist/CFMLComponentAssist.java
Add missing property for JumpToFunction
Merge pull request #9 from am2605/develop

Add missing property for JumpToFunction
Merge branch 'master' into develop