/stdhome

To get this branch, use:
bzr branch http://bzr.ed.am/stdhome

« back to all changes in this revision

Viewing changes to src/stdhome.in

  • Committer: Tim Marston
  • Date: 2016-04-10 20:17:32 UTC
  • Revision ID: tim@ed.am-20160410201732-w6358gtt2df1y5e9
added 'ci' as an alias of add; fixed issue with lack of output from vcs when
there are merge conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/env python
2
 
 
 
1
#!/usr/bin/python
 
2
#
3
3
# stdhome
4
4
#
5
5
# Copyright (C) 2013 Tim Marston <tim@edm.am>
21
21
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
22
22
 
23
23
 
24
 
# @PACKAGE_NAME@ version @PACKAGE_VERSION@
25
 
 
 
24
# @PACKAGE_NAME@ version @PACKAGE_VERSION@@bzr_info@
26
25
 
27
26
if __name__ == "__main__":
28
27
 
40
39
        # start main program
41
40
        from stdhome import the
42
41
        from stdhome.program import Program
43
 
        the.program = Program( "@PACKAGE_VERSION@" )
 
42
        the.program = Program( "@PACKAGE_VERSION@@bzr_info@" )
44
43
        the.program.run()