Skip to content
Snippets Groups Projects
Commit 2fcd19ba authored by jmillman's avatar jmillman
Browse files

Merge branch 'advanced_timeline' into timeline_and_image_analyzer 

Conflicts:
	branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
	branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
	nbproject/project.properties
parents e86d90d4 b3183fad
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 418 additions and 1484 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment