Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

76x Fireworks: auto-detect configuration after opening first file -- git reattempt 2 #11167

Merged
merged 4 commits into from Sep 7, 2015
Merged

76x Fireworks: auto-detect configuration after opening first file -- git reattempt 2 #11167

merged 4 commits into from Sep 7, 2015

Commits on Sep 6, 2015

  1. Add case to init without a configuration. Set main window size simila… 

    …r to pre-existing configurations.
    @alja
    alja committed Sep 6, 2015
    Copy the full SHA
    647572c View commit details
    Browse the repository at this point in the history

  2. Remove the case when there is an explicit empty configuration. Alread… 

    …y handled in CmsShowMain.
    @alja
    alja committed Sep 6, 2015
    Copy the full SHA
    544fdaf View commit details
    Browse the repository at this point in the history

  3. Autodetect configuration after setup in case config file name is not … 

    …give command line and file is loaded first stime,

Conflicts:
	Fireworks/Core/src/CmsShowMain.cc

Conflicts:
	Fireworks/Core/src/CmsShowMain.cc
    @alja
    alja committed Sep 6, 2015
    Copy the full SHA
    9949cf6 View commit details
    Browse the repository at this point in the history

  4. Merge fixes.

    @alja
    alja committed Sep 6, 2015
    Copy the full SHA
    108b7cd View commit details
    Browse the repository at this point in the history