- Timestamp:
- 01/11/17 21:35:17 (5 years ago)
- Branches:
- master, qt5
- Children:
- 809b5e5
- Parents:
- 54b69e2 (diff), 4a87a3b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)links above to see all the changes relative to each parent. - Location:
- src/app
- Files:
-
- 5 edited
-
application.cpp (modified) (1 diff)
-
application.h (modified) (1 diff)
-
appsettings.cpp (modified) (1 diff)
-
appsettings.h (modified) (1 diff)
-
main.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
src/app/application.cpp
r54b69e2 rebe26af 1 1 /* 2 2 * Copyright (C) 2010 Ixonos Plc. 3 * Copyright (C) 2011-201 4Philipp Spitzer, gregor herrmann, Stefan Stahl3 * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl 4 4 * 5 5 * This file is part of ConfClerk. -
src/app/application.h
r54b69e2 rebe26af 1 1 /* 2 2 * Copyright (C) 2010 Ixonos Plc. 3 * Copyright (C) 2011-201 4Philipp Spitzer, gregor herrmann, Stefan Stahl3 * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl 4 4 * 5 5 * This file is part of ConfClerk. -
src/app/appsettings.cpp
r54b69e2 rebe26af 1 1 /* 2 2 * Copyright (C) 2010 Ixonos Plc. 3 * Copyright (C) 2011-201 4Philipp Spitzer, gregor herrmann, Stefan Stahl3 * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl 4 4 * 5 5 * This file is part of ConfClerk. -
src/app/appsettings.h
r54b69e2 rebe26af 1 1 /* 2 2 * Copyright (C) 2010 Ixonos Plc. 3 * Copyright (C) 2011-201 4Philipp Spitzer, gregor herrmann, Stefan Stahl3 * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl 4 4 * 5 5 * This file is part of ConfClerk. -
src/app/main.cpp
r54b69e2 rebe26af 1 1 /* 2 2 * Copyright (C) 2010 Ixonos Plc. 3 * Copyright (C) 2011-201 4Philipp Spitzer, gregor herrmann, Stefan Stahl3 * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl 4 4 * 5 5 * This file is part of ConfClerk.
Note: See TracChangeset
for help on using the changeset viewer.
