Merge branch 'maint'

jlouis · Jan 29, 2011 · caf9352 · caf9352
2 parents 3b1f738 + a8fde31
commit caf9352
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 23 deletions.
diff --git a/apps/etorrent/include/etorrent_version.hrl b/apps/etorrent/include/etorrent_version.hrl
@@ -2,4 +2,4 @@
 %% Rather the idea is that it is bumped whenever we fix something really grave that
 %% might get the client banned from communicating with other clients.
 -define(VERSION, "d011").
--define(AGENT_TRACKER_STRING, "etorrent/1.2.0").
+-define(AGENT_TRACKER_STRING, "etorrent/1.2.1").
diff --git a/apps/etorrent/priv/webui/htdocs/index.html b/apps/etorrent/priv/webui/htdocs/index.html
@@ -15,7 +15,7 @@
 <body>
     <div id="doc3" class="yui-t1">
         <div id="hd">
-                <h1>Etorrent v1.2.0</h1>
+                <h1>Etorrent v1.2.1</h1>
         </div>
         <div id="bd">
             <div id="yui-main">
@@ -74,3 +74,11 @@ <h2>Latest log messages</h2>
     </script>
 </body>
 </html>
+
+
+
+
+
+
+
+
diff --git a/apps/etorrent/src/etorrent.app.src b/apps/etorrent/src/etorrent.app.src
@@ -1,7 +1,7 @@
 {application, etorrent,
  [
   {description, "BitTorrent client in Erlang"},
-  {vsn, "1.2.0"},
+  {vsn, "1.2.1"},
   {registered,
    [
     etorrent_acceptor_sup,
@@ -28,3 +28,11 @@
  ]
 }.
 
+
+
+
+
+
+
+
+
diff --git a/documentation/new_version.txt b/documentation/new_version.txt
@@ -2,7 +2,7 @@ How to get a new version of etorrent out:
 
 - Make sure the master branch has everything you want it to have
 
-- Edit version.hrl
+- Edit etorrent_version.hrl
 - Edit webui version tag.
 - Edit apps/etorrent/src/etorrent.app.src version
 - Edit rel/reltool.config version

diff --git a/project.desc b/project.desc
diff --git a/rel/reltool.config b/rel/reltool.config
@@ -1,6 +1,6 @@
 {sys, [
        {lib_dirs, ["../deps", "../apps"]},
-       {rel, "etorrent", "1.2.0",
+       {rel, "etorrent", "1.2.1",
         [
          kernel,
          stdlib,
@@ -11,7 +11,7 @@
 	 etorrent,
 	 riak_err
         ]},
-       {rel, "etorrent_dev", "1.2.0",
+       {rel, "etorrent_dev", "1.2.1",
         [
          kernel,
          stdlib,