~mc-return/compiz/compiz.merge-src-header-files-cleanup

« back to all changes in this revision

Viewing changes to include/core/abiversion.h

  • Committer: MC Return
  • Date: 2013-06-20 05:56:13 UTC
  • mfrom: (3724.2.16 0.9.10)
  • Revision ID: mc.return@gmx.net-20130620055613-8dp00nmw2jpm3ptu
Merged latest lp:compiz and fixed conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
5
5
#  error Conflicting definitions of CORE_ABIVERSION
6
6
#endif
7
7
 
8
 
#define CORE_ABIVERSION 20130125
 
8
#define CORE_ABIVERSION 20130415
9
9
 
10
10
#endif // COMPIZ_ABIVERSION_H