labofsahil/github-event-dataset-2012 huggingface dataset:
some things should be private in PageHandler
Like, resolving conflict when I am in conflict with myself, weird! :-))
(Merge branch 'master' of github.com:runn1ng/FilmTit)

Conflicts:
	src/gui/src/main/java/cz/filmtit/client/PageHandler.java
adding possibility to change both chunk times in one RPC (FilmTitService and US - rough)
a Callable to change chunk times
changing chunk times in TranslationWorkspace - quite rough, TODOs, but works! (does not check the format so if you input some rubbish, you will see it there, but you will break your document (US does no format checks either))
backup
Merge branch 'master' of github.com:rve/MidasReader

Conflicts:
	read/views.pyc
Added method for enabling simplification in MaxSAT interface
small change, want to pull
Merge branch 'master' of https://github.com/ryanogle/chattr
add jquery ready
Added ref to Mathematica spot values.

git-svn-id: http://svn.boost.org/svn/boost/trunk@78153 b8fc166d-592f-0410-95f2-cb63ce0dd405
Polygon: refactoring point data/traits/concept; adding point data/traits/concept unit test; updating documentation.


git-svn-id: http://svn.boost.org/svn/boost/trunk@81006 b8fc166d-592f-0410-95f2-cb63ce0dd405
hook undocumented convert Fusion customization point so that mpl algorithms work with proto expression types

git-svn-id: http://svn.boost.org/svn/boost/trunk@80273 b8fc166d-592f-0410-95f2-cb63ce0dd405
untabify

git-svn-id: http://svn.boost.org/svn/boost/trunk@80274 b8fc166d-592f-0410-95f2-cb63ce0dd405
fix oops in range function objects

git-svn-id: http://svn.boost.org/svn/boost/trunk@80275 b8fc166d-592f-0410-95f2-cb63ce0dd405
Boost Build cleanup - added a FIXME note regarding an encountered potentially incorrect implementation comment in the main Boost Build routine.

git-svn-id: http://svn.boost.org/svn/boost/trunk@79872 b8fc166d-592f-0410-95f2-cb63ce0dd405
Boost Build cleanup - minor stylistic change.

git-svn-id: http://svn.boost.org/svn/boost/trunk@79873 b8fc166d-592f-0410-95f2-cb63ce0dd405
Made Boost Build clear its 'current project' reference after it is done with loading project modules. Any request for the 'current project' reference when there is no project module currently being loaded will now be treated as an error. Updated the related indirect_conditional.py internal Boost Build test case accordingly.

Additional implementation notes:
  - internal worker project.load-jamfile() rule now resets the current project when done
  - project.use() no longer needs to reset the current project since project.load-jamfile() does that now

git-svn-id: http://svn.boost.org/svn/boost/trunk@79874 b8fc166d-592f-0410-95f2-cb63ce0dd405
sending length should reflect quote-escaping.
OSX: Use unrar 4.10 for Leopard and older to keep PPC support.
(SL and Lion will get unrar 4.11)
when marker is clicked, add some options: begun
removing and adding markers now both working
index functional links
index urls updated
adding jsrender and jsview templating
basic template setup done
working on links json display
links displaying now
batteling through jsrender
this stuff is amazing
link adding done
remove link work half complete, also added a hax solution to the double even attachment issue
link removed finished
delete location now hides info box on complete and fixed message on success. old delete code marked as deps
most things working okish now
moving link info into a seperate lib
adding link lib
slowly changing link file to module pattern
module pattern more in place, and code tidyups and control stuff written
getting closer to working again
libgnomeprint: indicate dependency on libffi and revbump


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@97898 d073be05-634f-4543-b044-5fe20cf6d1d6
irssi: rev bump for perl changes


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@95362 d073be05-634f-4543-b044-5fe20cf6d1d6
sysutils/vimpager:
Update to version 1.6.7


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@91708 d073be05-634f-4543-b044-5fe20cf6d1d6
Refactor loadResources() to use TextureRegionAndAtlasCreator.
Refactor loadResources() to use TextureRegionAndAtlasCreator.
Barricade and it's brick first draft.
OS X用にエイリアスとGNUTERM変数設定を追加
Granite fixes for PopOvers
Add base class for control
Add terminal control
Fixed some focus outlines and other tidbits
add tests for tftp::client and tftp::server
Revert "autojump 21.0.3"

This reverts commit b4aadae5b4f8c1df20935b8cbb06363f60763c81.
ffmpeg: fix typos

Fixes #15800.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
ffmpeg: fix more typos

c.f. #15800.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Add Xcode 4.5.2 to standard compilers map

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
autojump 21.0.3

Update files to reflect new source locations.

Existing users upgrading must note the new autojump.sh location
and modify ~/.bash_profile or ~/.zshrc appropriately as mentioned
in the caveat message.

Fixes #15797.
Closes #15793.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
openssh: use more reliable server

Closes #15806.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
avro-cpp 1.7.2

Closes #14322.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
HAProxy: add --devel with SSL

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
superenv: Builds need to use the right git/svn too

stdenv already works as Contributions/cmds is in the path already.

This is safe to do because OS X already has git and svn in the PATH if you have the CLT installed. So we should definitely ensure we use the right versions.

Fixes #15783.
scm-manager 1.22

Closes #15809.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
gdal: Transition to options DSL

Replace `def options` with `option` statements and replace all calls to
`ARGV.include?` with `build.include?`.
gdal: Re-enable Poppler support

Currently, GDAL 1.9.2 can build against Poppler 0.20.5 so Poppler support is
not re-enabled for the `--complete` option.

Reverts cfad309.
libkml: Add HEAD build

Closes #15728.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
jasper: Use sources from OSGeo

The OSGeo sources include a patch that allows Jasper to compute UUID bounding
boxes---a feature that is required for accessing certain georeferenced images.

The Debian packages for Jasper also include this patch.
gdal: Refactor configuration

General cleanup and some specific changes:

  - Now depends on Homebrew's libtiff and libgeotiff now that BigTIFF support
    has landed upstream. This should prevent clashes arising from having
    internal and external copies of these libraries loaded by the same
    executable as noted in #7054.

  - Add WebP support to the `--complete` option.

  - All backends for which there is no suitable stable formula in core are now
    explicitly listed and disabled using `--without-<backend>` flags during
    configuration. This behavior may be disabled by using the
    `--enable-unsupported` flag which allows configure to drag in any libraries
    that it finds in the user's environment that GDAL enables by default.
    Previously this behavior was a side-effect of the `--complete` option.
gdal: libdap build fixed upstream

Patch no longer necessary when building HEAD versions.
HBase 0.94.2

Closes #15819.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
abcMIDI 2012-10-03

Closes #15818.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
smartmontools 6.0

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
nginx (devel) 1.3.8

Closes #15828.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
added a new alias from the DOS-era and removed a misconfigured .gitmodules dir
edinburgh august 2012
I18N: Fix Italian translation (swap translations for two strings)
I18N: Update Hungarian translation from patch #3519030
I18N: Regenerate translations data file
NEWS: Fix a typo
I18N: Update Hungarian translation from patch #3598125
DREAMWEB: Support opening data files from  ES and FR CD version
DREAMWEB: Add character mapping for french version
DREAMWEB: Minor style fixes
DREAMWEB: Simplify modifyFileName() by using _datafilePrefix
Merge pull request #229 from criezy/dreamweb-fr

Support for Dreamweb fr/es
- z-index fix
Weird fix to a compatibility problem.
Er, maybe this fixes it
Hax
player.cc
Preparing for LEGIT SPRITES
Added dummy variable for globals
Attractor stub stuff added
Attractor system implemented on the move side of things, still need an infrastructure to USE them
Forgot this bit
More attractor stuff
Merge branch 'alpha' into spritetransition
Oops
Merge branch 'alpha' into spritetransition
WOW. How did I not catch that?
Merge branch 'alpha' into spritetransition
Global attractors implemented.
Sanity check
Oops
Merge branch 'alpha' into spritetransition
Rudimentary sound support added. Currently you have to supply your own OGGs.
vimrc arrange keymappings
vim add javascript snippets
jshintrc relax null equality check
Auction and AuctionSniper are introduced
Option to restrict to SNPs in dbSNP. Closes #18.
Make default filename more sensible.
Increase clarity of some checkbox labels.
Fix #19: incorrect flagging of nonsense mutations.
Merge branch 'bugfix19'
Exclude dbSNP locs, rather than non-dbSNP locs.
fixed bug in multiline titles
Forgot Decorator.js
Added comfort labels. Added minor exception handling.

Still needs major rework.
Continuing testing multiple parsers
field and color new export
Merge branch 'drush_branch_extract' of https://github.com/shakty/Patterns into drush_branch_extract
interpolate ns
created bin directory
added init.d script
updated directory structure
added fork on startup and option to prevent forking
updated default arguments
yaf url

为yaf新增url生成类。

新增url实现
Site updated at 2012-05-05 09:53:57 UTC
Stopgap so I can figure out how to share this stuff
Moved unban command to a bin
Move some commands to command files.
Fix the card schema
Remove util.h from db.h
Add slice to module
Fixup: empty sst file when read
Add malloc/calloc check
Change error return code
Fix close when fd is 0
Reformat the sst file
Reformat flush merge list
Add make sst name
Add crc to check get value
Review sst&meta.Change Range Binary-Search to sorted list search
count is OK, but thread broken
Fixed meta MAX error
ADD binary search
Fixed log recovery bug,format log file
added rake task "deploy_on_heroku"
set title
Change Makefile.mingw to create hidapi-testgui.exe
Autotools on Windows
- Putting in a nice formatting feature for super strings.
Bugfix: don't fail if fwinit.editor isn't set

Change-Id: Ied63fcbd89efb6de6a811a617ead220f1e716db3
Reset some more things

- Reset origin when --reset is passed as parameter.
- force copy hooks, init gitflow and remove obsolete entries.

Change-Id: If9507c5d19653ba44b1b07c7b8beb210cea8c30b
Replace == with =

Change-Id: I0f54db4cd91162219ceadf3193966b6d32b303a9
Add ability to clone repos stored on different hosts

The WorldPad repo isn't mirrored on GitHub, so the init script needs
to be able to clone from different hosts. This change adds a new column
to the repo definitions and handles different hosts.

Change-Id: I4da5268496d27850435bdb3b1dbd48123ab9e88b
added codes to MonteCarloEngine::PrintHistogram() for checking if a histogram is empty.
removed a bug from MonteCarloEngine.cpp.
Mongoose schemas, better structure

Updated with Mongoose schemas, better project structure
fixed math error in 'other' transport stat for one page report
Fixing up closing tag
Organize Readme, add intro sentence with links
add yuan tie
Learning how to use bash scripts.

* Made it `gsd` executable. (chmod 755)
* Created case structure for basic commands.
* Added if statement to check use with `sudo`
Improve Detection IC's

Signed-off-by: me4502 <mnmiller1@hotmail.com>
Added filter container
Merge branch 'master' of github.com:skddc/unstagram
added py27chk
Add Quark.Text() for simple text drawing
Update README.md
bugfix for DOMContext, Graphics.
correct squirrel demo
处理canvas模式下构造displayobj指定DOMContext时出现的一些问题
Merge branch 'master' of https://github.com/quark-dev-team/quarkjs

Conflicts:
	js/quark.base-1.0.0.js
	src/base/context/DOMContext.js
fixes few errors in permantent transfers
fix missing birth certificate on leave 34
added leave 58 printout
Simplified dirac flags for oppKron2Lo
avoid version checking of openssl, use more unix

With a cut and a slightly different awk line, potentially
brittle version checking is avoided.
try again with label alignment, try 2
Fix a bug that the size of shape in VML is wrong on IE8. rect corner doesn't move.
Adds tomorrow theme
adding oauth2 support
Don't modify the connection's query_options with options set on a single query. Issue #243.
Merge pull request #341 from sodabrew/issue-243

Don't modify the connection's query_options with options set on a single query - Issue 243
Added citation to Micro-Tom GBrowse track.
ontology form is hidden after submitting a term
get right path for archived tmp file
no need to exclude
Externalize version.
I try this schema but doesn't work:

03:32:38.410 [org.apache.directory.seserver.EmbeddedADSVer157.main()]
DEBUG o.a.d.s.l.s.l.e.i.DefaultSchemaLdifExtractor - BASE_PATH set to ,
outputDirectory set to /tmp/server-work
03:32:38.412 [org.apache.directory.seserver.EmbeddedADSVer157.main()]
DEBUG o.a.d.s.l.s.l.e.i.DefaultSchemaLdifExtractor - Output directory
exists: no need to create.
03:32:38.412 [org.apache.directory.seserver.EmbeddedADSVer157.main()]
INFO  o.a.d.s.l.s.l.e.i.DefaultSchemaLdifExtractor - Schema directory
'/tmp/server-work/schema' does exist: extracted state set to true.
03:32:38.418 [org.apache.directory.seserver.EmbeddedADSVer157.main()]
DEBUG o.a.d.s.l.s.l.ldif.LdifSchemaLoader - Using
'/tmp/server-work/schema' as the base schema load directory.
03:32:38.418 [org.apache.directory.seserver.EmbeddedADSVer157.main()]
DEBUG o.a.d.s.l.s.l.ldif.LdifSchemaLoader - Initializing schema
java.lang.NullPointerException
        at
org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader.initializeSchemas(LdifSchemaLoader.java:141)
        at
org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader.<init>(LdifSchemaLoader.java:121)
        at
org.apache.directory.seserver.EmbeddedADSVer157.initSchemaPartition(EmbeddedADSVer157.java:127)
        at
org.apache.directory.seserver.EmbeddedADSVer157.initDirectoryService(EmbeddedADSVer157.java:161)
        at
org.apache.directory.seserver.EmbeddedADSVer157.<init>(EmbeddedADSVer157.java:233)
        at
org.apache.directory.seserver.EmbeddedADSVer157.main(EmbeddedADSVer157.java:266)
        at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
        at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
        at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
        at java.lang.reflect.Method.invoke(Method.java:616)
        at
org.codehaus.mojo.exec.ExecJavaMojo$1.run(ExecJavaMojo.java:297)
        at java.lang.Thread.run(Thread.java:679)
Updated code with PEAR coding standards
Merge branch 'rupa'
Custom admin was not granted the correct permissions when created from the installer, fixes #1492
Typo in installation instructions
Check to see installer is not creating a user with the name of 'admin' or 'anonymous'. GH issue #1627
remove undoremove scratch for phone numbers, wip
Update copyright, fix javadoc.
can now skip following the location header.
horrors cannot harm indifferent characters, added dreams and nightmare messages to sleep mechanic
make sure the module will load:  lazy load checking for already loaded components.
initial commit
version 0.1
beta 0.2
bug
hotfix
Merge branch 'iss30' - fixed merge conflic as well by LOL NOT TELLING YA

Conflicts:
	README
added 1
Merge branch 'master' of github.com:staramir/ourGit
checkout after experiments
add ezless_imports
Verdere ontwikkeling webshop
validate regular expression
this process takes way too long for big buckets, and impacts service.
In progress work of updating the emulator
Created a new Base (abstract) module
doubt my tcpstream mechanism, to reset
Disabled guppy profiling

Presently, several bugs in guppy cause initialization errors when
calling the heapy module. This normally passes an ImportError
exception to the RMG run output, but has been found to result in
segmentation faults that crash RMG runs entirely.

Since we don't really use the profiling for all that much,
disabling heapy completely should be fine until a more stable
release fixes these issues.
added default value
parse with NumberUtils
formatting and minor refactoring
Added caching layer for node properties in order to speed up sorting.
Merge branch 'develop' of ssh://github.com/structr/structr into develop
Request and answer sections were added
added summary of Meeting to ReadMe
Upgraded dor-services to 3.17.2: fixes bug in public XML (DC)
Render newlines as <br/> tags in Item and Collection abstracts
APOs: added hydra:referencesAgreement node
Notes
example company name and contact info header for statements
GTK3 fix. Workaround for bug https://bugzilla.gnome.org/show_bug.cgi?id=679654 which prevents list_families() being called more than once to generate a list of fonts. Text reports and anything else which uses the PDF backend now works

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@20212 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
GEPS008: Moved Bookmarks module

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@19776 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
Changed version to '-SNAPSHOT'
Vim: Remove all haskellmode's traces. Add ghc-mod hotkeys.
disable -D haxe3 for haxelib right now (neko v1)

git-svn-id: http://haxe.googlecode.com/svn/trunk@5477 f16182fa-f095-11de-8f43-4547254af6c6
make sure PHP output does not implement duplicate interfaces (fixed issue #761)

git-svn-id: http://haxe.googlecode.com/svn/trunk@4620 f16182fa-f095-11de-8f43-4547254af6c6
[cs] changes to fixed and "checked" block test case

git-svn-id: http://haxe.googlecode.com/svn/trunk@5108 f16182fa-f095-11de-8f43-4547254af6c6
check that regexp neko library can be loaded

git-svn-id: http://haxe.googlecode.com/svn/trunk@5488 f16182fa-f095-11de-8f43-4547254af6c6
fixed constraint check in case subclass does not have type parameter (fixed issue #1074)

git-svn-id: http://haxe.googlecode.com/svn/trunk@5190 f16182fa-f095-11de-8f43-4547254af6c6
Working on the new MethodMoveTransform.
tree improvments
Bump monolog version
merged branch Seldaek/deps (PR #4103)

Commits
-------

4633fa9 Bump monolog version

Discussion
----------

Bump monolog dependency in 2.0
[WebProfilerBundle] Fixed white pixel in toolbar info
merged branch pborreli/profiler-pixel (PR #4969)

Commits
-------

3bb975c [WebProfilerBundle] Fixed white pixel in toolbar info

Discussion
----------

[WebProfilerBundle] Fixed white pixel in toolbar info

Fixed this ![white pixel](http://www7.pic-upload.de/18.07.12/l7ve9xrevwc.png)

Tested on IE9/FF/Chrome
updated CHANGELOG for 2.0.20
update CONTRIBUTORS for 2.0.20
updated VERSION for 2.0.20
[FrameworkBundle] fixed XSD for the trusted-proxies setting
[FrameworkBundle] fixed trusted_proxies configuration for some edge cases
bumped Symfony version to 2.0.21-DEV
updated CHANGELOG for 2.1.5
Merge branch '2.0' into 2.1

* 2.0:
  bumped Symfony version to 2.0.21-DEV
  [FrameworkBundle] fixed trusted_proxies configuration for some edge cases
  [FrameworkBundle] fixed XSD for the trusted-proxies setting
  updated VERSION for 2.0.20
  update CONTRIBUTORS for 2.0.20
  updated CHANGELOG for 2.0.20

Conflicts:
	CONTRIBUTORS.md
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
	src/Symfony/Component/HttpKernel/Kernel.php
updated VERSION for 2.1.5
bumped Symfony version to 2.1.6-DEV
[FrameworkBundle] fixed ESI calls
[FrameworkBundle] fixed ESI calls
fixed typo
Merge branch '2.0' into 2.1

* 2.0:
  fixed typo
  [FrameworkBundle] fixed ESI calls

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/HttpKernel.php
Merge branch '2.1'

* 2.1:
  fixed typo
  [FrameworkBundle] fixed ESI calls
  [FrameworkBundle] fixed ESI calls
  bumped Symfony version to 2.1.6-DEV
  updated VERSION for 2.1.5
  updated CHANGELOG for 2.1.5
  bumped Symfony version to 2.0.21-DEV
  [FrameworkBundle] fixed trusted_proxies configuration for some edge cases
  [FrameworkBundle] fixed XSD for the trusted-proxies setting
  updated VERSION for 2.0.20
  update CONTRIBUTORS for 2.0.20
  updated CHANGELOG for 2.0.20

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/HttpKernel.php
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
	src/Symfony/Component/HttpKernel/Kernel.php
Update src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php
merged branch guilhermeblanco/patch-6 (PR #4456)

Commits
-------

3ef377b Update src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php

Discussion
----------

Update src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php

Better patch for initialization/regeneration of id of already started session

---------------------------------------------------------------------------

by travisbot at 2012-05-30T05:31:15Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1474248) (merged 3ef377b6 into 223d187a).
Removed unnecessary use statements
merged branch pkraeutli/browserkit_use_cleanup (PR #4324)

Commits
-------

fe7b258 Removed unnecessary use statements

Discussion
----------

[BrowserKit] Removed unnecessary use statements

Merely a cosmetical fix. My IDE (PhpStorm) marks the `use Symfony\Component\BrowserKit\Client;` statement in  `Symfony/Component/BrowserKit/Client.php` itself as an error.
I also removed the two other `use`s of classes from the same namespace.

---------------------------------------------------------------------------

by travisbot at 2012-05-18T11:27:02Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1365455) (merged fe7b2583 into 1e15f210).
[Config] Fixed tests on Windows
merged branch hason/config_tests (PR #5583)

Commits
-------

65281fb [Config] Fixed tests on Windows

Discussion
----------

[2.1][Config] Fixed tests on Windows

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT
344.09a Testing some cornering
less moving distance for the pull-in effect
drop bayesian network representation
Modify http.cpp

Signed-off-by: Eli Qiao <taget@linux.vnet.ibm.com>
Use 8-bit chars in ffi instead of unicode chars
Support IPv6 for natumeserver
Update copyright years
Reformat copyright notice
natume 0.13
Optional start and stop segments.
added release fest
Add test report generator
[#2] add RIPE IPv6 first allocation template
Added link to text module
404s
Prepare
major optimization
Merge branch 'master' of https://github.com/temas-hub/sc2BO

Conflicts:
	src/sc2build/optimizer/BuildOptimizer.java
	src/sc2build/optimizer/SC2Planner.java
Fix parsing bug caused by bad formatting of tags,
traversing improved
Prettified server code a bit.
Show corpus name on start page
Added config.py in gitignore.
wip
kill .DS_Store
Fix 'make dist' & 'make distcheck' bug
#5 Criação Dummy de Frases...
doc for Prim_port
doc for Prim_env
added code to quartrz
Contact info on the Help page and about page is configurable through 'web.config'
Data context initialization no longer powers on VMs at startup
added diving animation
Merge branch 'master-fade' of https://github.com/timclayton/hc12
Fix unit test so they work with current F17 repos.
fix issue in GetPackagesByName to not return the same installed package more than
one time, even if it available in multiple repos.
Fix the org.baseurl.Yum exec helper shebang to make the daemon work on F17
ipaw paper - jim
now captures stderr

Signed-off-by: Tim Henderson <tim.tadh@gmail.com>
Working on drawing the radius (which is working) and switching out for a better marker...
Initial commit
Changes to readme.md
Added test_case\Unit
changed readme
Icons zeigen, selbst wenn  == null, weil der Herr Bambach ja meint, dass muss so sein
adds tab interface
resilient2
allow to define default validator used in all attachments
Fix for Android GCC compile
CSSモジュール集更新。予定されていた一通りのモジュールについて策定完了。
- 回り込み画像 .float_image, サムネイルリスト .thumb_list, ページャー .pager, 注意喚起ユニット .attention について新たに策定が完了した。
opt
xxx
Cleanup whitespaces

Auto-removed all trailing whitespaces
Add global config variables for wordpress-multisite

Refactoring to allow global variables in wp-config (or your themes
functions.php). This way a wordpress multisite can configure all blogs
at once. The local/blog-specific configuration overwrites the global
configuration.
$wpfbogp_wpfbogp_app_id_global = '123';
$wpfbogp_fallback_img_global = 'http…';
Ack ignores node_modules by default.
Handle videos that haven't been uploaded to UST
disable old wifi

Change-Id: Ib7965bec9a248f990c17e898554552c77764117e
Install more detail headers for codash
Some optimizations, minor changes, LFO modes
Pool EventFollowers
Add multiple LFO shapes (algorithms not yet tested)
Rank per-voice event priority each frame, rather than on each request!
Make SVFilter interp a little slower in vague hopes of improving popping
Lower demo polyphony again
Added basics
Stats and better word weights.
Merge branch 'master' into gh-pages
.tmux.conf paste to Mac OS X binding added
Add NPC rule
toL9v5.1: l9pointers[1]->dictdata
toL9v5.1: left 56->45 changes
Update TODO

added task
Add StaticPages controller
Add tests, static about page
finish static pages
Merge branch 'release/2.0.3'

* release/2.0.3:
  version bump
  updated default config docs
  added config option to use image filename as title
updated todods
Merge branch 'develop'

* develop:
  updated todos
Merge branch 'develop'

* develop:
  updated todos
Merge branch 'develop'

* develop:
  README additions
Merge branch 'develop'

* develop:
  readme update
Merge branch 'develop'

* develop:
  fix readme formatting
Merge branch 'develop'

* develop:
  Cleaned up logging formats
Merge branch 'develop'

* develop:
  oops. Removing oauth reference from master
  ignoring
Merge branch 'release/2.0.4'

* release/2.0.4:
  version bump
  Implemented max_retries fallback
  Added some command line options
  Adding Instapaper Plugin
Merge branch 'develop'

* develop:
Merge branch 'develop'

* develop:
  README update, develop mode and command line options
Merge branch 'release/2.0.5'

* release/2.0.5:
  version bump
  fix for options being written to config
Merge branch 'develop'

* develop:
  ignoring developer folder
  added -v/--version option and incremental build number
Merge branch 'release/2.0.6'

* release/2.0.6:
  version bump
  removing futils entirely and multibyte characters from shell escape
  trying to fix Hazel integration
Merge branch 'release/2.0.7'

* release/2.0.7:
  version bump
  fix for Tumblr and other RSS feeds, fix for CLI options not working
  removing futils entirely and multibyte characters from shell escape
Merge branch 'develop'

* develop:
  version bump
  I think I fixed the foursquare plugin.
Merge branch 'develop'

* develop:
  version bump
  Changed pubDate to date and all seems well
Merge branch 'release/2.0.8'

* release/2.0.8:
  incremental version bump for 2.0.8
  version bump
  fixes for RSS parser fallbacks and FourSquare config
  Pinboard plugin, bugfixes.
  version bump
  Allow retries for Twitter checks (retry # can be set with -r X, default 1)
Merge branch 'develop'

* develop:
  Readme update
Ialian language file

Signed-off-by: tudo75 <tudo75@hotmail.com>
add image for menu but not complete
new compiler: fix macro definition, support compile-time import of specific definitions
new compiler: check if recompilation is necessary, write module file
new compiler: inline definitions in module, replace %unary with %native-call (works with normalization)
Added to Asset-touch example.
-Added field and textfield adapter
Check for cycles when running a goal.
Merge pull request #35 from benjyw/master

Check for cycles in pants goal.
Add special solution file containing the IronRuby project.
Remove http-parser.

This is and should be a binding for libuv only.
I'll probably export http-parser as a seperate project.
Delete old images, fix chat view
Updated appname (for HRD) and pep8 fixes.
日程页调试，table类直接打表undebugged
[12007] Add new CONDITION_REPUTATION_RANK_MAX (30)

Rename old CONDITION_REPUTATION_RANK to CONDITION_REPUTATION_RANK_MIN

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[12008] Fix BoA items conversion

Thanks to stfx for porting

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[mr2026] some corrects to utility subsystems (required for dynamic_vmaps)
[mr2026] implement dynamic_vmaps (Reamer version) - dynamic line of sight base code by Silverice; - Trinity implementation by subv; - Corrected liquid type extraction by Shauren, close #901; - final cleanup and re-implement by Reamer. vmaps version changed to V4.00 2012_02. need re-extract vmaps and mmaps! close #770.
[mr2026] remove old compiled utility binary and also some VC projects (not supported now)
[mr2026] add compiled binary utility packs for win32/64.
[mr2027] implement and use PROC_EX_IGNORE_CC. related to #1044
[12009] Fix wrong implementation of spell 48590 from [12005]

Thanks to rsa for pointing to the problems
Original author of now similar patch unknown

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
Merge branch 'master' of https://github.com/mangosR2/mangos

Conflicts:
	src/game/Spell.cpp
[mr2028] make a destructor virtual
[mr2029] Fix compile warnings
Merge branch 'master' of https://github.com/mangos/mangos
[mr2030] fix spell 51519 Death Knight Initiate Visual
Merge branch 'master' of https://github.com/mangosR2/mangos
[12010] Implement spells 28832 28833 28834 28835 (Naxxramas Four Horsemen Marks)

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[12011] Implement spell 33326

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
no dinamic maps
[mr2031] Move Check for CheckTargetCreatureType to SpellMgr for later use
[mr2032] Vehicle handling for special Liquid Auras and better player handling with new static function IsTargetMatchedWithCreatureType from previous commit

Fix Liquid aura in Wintergrasp
[mr2033] rewrite of function VehicleKit::GetNextEmptySeat
- make a possibility to find empty seats with specific flag
- rename to GetNextEmptySeatWithFlag
- remove generell check IsUsable() in this function
	-> at the moment I see no sense in this check
	-> remove Hacks for ICC-vehicles, not needed
Integrated explainpat.
:Exp is ambiguous after explainpat.vim, which share the same prefix.
In the map :Exp is written as :Explore now.
Update missing files.
Upload.
Revert f4026cb5c83a4ca87211cde427b39765a67b1798^..HEAD
Revert f4026cb5c83a4ca87211cde427b39765a67b1798^..HEAD
Minor css tweak on Remote
"AddDefaultCharset UTF-8" added
extract helper method
fix a redirect url by fixing some bad param sanitization
extract private method `set_attrs_from_params`
convert test to spec
convert test to spec
normal ok
make
obj code support
Fixing random mistakes in CMake.
Define a variable with the include dirs for UGDK.

Cleanup install code.
Use option to find if building static or shared.
removed unnecessary list copying
clarified string check intent
removed unnecessary list constructor
refactored loop into list comprehension
removed unnecessary len() call
cleaned up string_def build loop
typofix: information
Merge pull request #1 from dnet/master

Minor cleanup
Mathias comments are fixed
Final Mathias comments
Final Mathias comments
Font size is fixed: document font size - 12; section title size - 14; subsection and sub-subsection - 12
"Data Extraction Algorithm" explanation sentence is fixed
moved Blade build and core runtime files into a Core directory
Initial add of a knockout API
Moved setup items to a separate solution
moved Blade build and core runtime files into a Core directory
Added a simple knockout example
Mmfile uploads handler with console command.
update subversion to 1.7.7
updated mercurial to 2.4
Put version 1.0 GOLD into repository.
Beta release
Docs
added support for dynamic content languages
changes as of 28th.nov,phone-conversation
deleted CNAME
Merge branch 'gh-pages' of https://github.com/venil7/veridian into gh-pages
Turn off blinking in normal mode
Don't check for auto cmd
Misc
Use distinguished for default color theme in terminal vim
Reorder stuff
Minor changes in parameters:
High outie never computed;
high single computed only when contig length greater than insert
remove design.io from generator
remove forever
show 6 post one page
create empty app and add foundation
add sorcery
login work
Use grep -c instead of wc -l
Update cyberoam alias for wifi at Mumbai accommodation
Fix getting correct CPU architecture (32/64bit)
Restore Fx repeat_i,repeat_x
Add logging of errors/failures, fix logging initialization
bump version
ajout d'images de l'univers virtuel
sdfg

sdfg
Registratin inlineview added
Got FragmentLength to pass on a simulate bam file. 
Fixed issue with possible fragment lengths showing up during second read
counting.
Updated to 1.7.4

Better Metrics, Fixed Config not saving.
fbrun changed to gmrun
group作成からapi表示まで
Fixed outgoing ray direction for infinite area lights.
remove relactivenumber. too heavy...
using heroku now
nvm and emacs updates
src

Signed-off-by: wangkun <wangkun@jike.com>
Refresh during pauses

Instead of refreshing the view after every keystroke, instead wait for
the user to briefly pause while typing (currently, a 200ms pause will
trigger a refresh within 500ms). This behavior seems better because:

- Re-rendering the instant view after every keystroke feels sluggish
- Allowing the user time to finish their immediate thought before
  presuming they want a refresh

With 200ms / 500ms, the live-render feels pretty snappy, if slightly
delayed. We can always tweak it later.
Fix slutsats surplus section and fix sections in inledning
新增suggestion
修改overlay的bug
package file
updated package to reflect new deps
渠道修改,增加英国亚马逊
perChild -> pricePerChild
Merge branch 'master' of ssh://github.com/wego/mothership
Add transaction table, Add search category
Added archive files
WIP: Capistrano retain images on deploy
(progn (search-backward-regexp "[^\n\s-]\\W*")
(global-set-key (kbd "C-c H-i") 'ido-switch-buffer)
add great jenkins-watch
Patch from Hugo Trippaers
https://reviews.apache.org/r/5698
CentOS 6.2 ships tomcat6-el-2.1-api-6.0.24.jar with tomcat just like RedHat
Applying patch from Prasanna Santhanam
Marvin sandbox example scripts for generating one host configurations
https://reviews.apache.org/r/5656
cleaning up some line endings
Patch from Chip Childers
https://reviews.apache.org/r/5704/
License header updates for the server folder
License header updates for the ovm folder from Chip Childers
https://reviews.apache.org/r/5706/
License header updates for the core folder from Chip Childers
https://reviews.apache.org/r/5705/
moving out NetApp code to plugins/file-systems/netapp
stopgap to fix the RPM issues created by the plugins
Patch by Hugo Trippaers
https://reviews.apache.org/r/5697/
CS-14907: Only allow download volume for uploaded volumes

This fixes an issue where an uploaded volume that hasn't been moved to
primary storage yet is downloaded, causing an error. This adjusts the
actionFilter to fix this.

Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
reviewed-by: Brian Federle <brian.federle@citrix.com>
CS-15313: Error handling for account section

This fixes an issue where an error is not displayed when entering an
invalid account name.

Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
reviewed-by: Brian Federle <brian.federle@citrix.com>
moving out ELB network element to plugins/network-elements/elastic-loadbalancer
CS-15274: Fix NPE on CreateVlanIpRangeCmd()

Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
CS-15300: Domain Admin accounts now respect the limits imposed on the domain just as a regular account.
Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
From: jason.bausewein@tier3.com
Fixed deployDataCenter.py to select the correct network offering based on if security groups are enabled.  Also added default value to configGenerator.py for basic setup.
From: jason.bausewein@tier3.com
Updated script to create cloud_usage database similar to deploy-db-dev.sh.
Making nexus vsm password encryptable
Encrypting password values that are stored in the cluster_details table
move to devcloud
add console proxy support for devcloud
fixing license headers in marvin
add completion for jumpto
add Vundle install section to vimrc
add watch and make
Update 11th Grade/TP/Classwork/exam/exam2.rb
@wjw_fix: 修复Sqs4JMBean名称有前导空格的错误.
fix admin vote page
display  respondsive
edit db url
fix main view
new admin project page
Merge branch 'master' of https://github.com/wkkp/eXceedVote

Conflicts:
	app/models/Ballot.java
	app/views/adminMain.scala.html
	app/views/adminProjectList.scala.html
	public/bootstrap/css/docs.css
fix conflict
add logo
fix admin main
fix projectlist page for admin
add js
update js
fix nav list
update css
pull from master
Change the rollback strategy
Improve resolution
Merge pull request #412 from wkollernhm/master

Fixing HTML-Entities encoding for imported OLEF
Bug fixing
Merge branch 'master' of https://github.com/bhle/bhle
additional solr field for title boosting
Merge branch 'master' of github.com:bhle/bhle into dev
ignoring drupal generated language files
Bug Fixing (multi-threaded rollback)
Merge branch 'master' of https://github.com/bhle/bhle
Add Maven Profile for production environment
fixing #413 (facet for Material type errors)
Merge branch 'master' of github.com:bhle/bhle into dev
Fixing PDF generation code to finally work
PDF-Pages are now read using pdfinfo instead of using custom code
Bug fixing (BibUtils.java -> Tmp)
Merge branch 'master' of https://github.com/bhle/bhle
Cleaning PDF conversion mode
Extracted TIFs now conform to the FSG file naming scheme
Extracted OCR Text now conforms to the internal naming schemes (.txt suffix)
Added function for cleaning up PDF names (since they may be arbitrary)
Merge branch 'master' of https://github.com/bhle/bhle
Implemented serialization for TrickEvaluator objects.
isMaximized support method for CardWindowManager
Proper tap handling for Wave Launcher
Correct power key timing
Removed a bugfix entry since the bug was in an unreleased version.
adding regenerate buttons
successfully writing out the first dot file.
fixed incremental updates of AlarmSector
added set of enhanced operation ids
new bak
spaces for indents in options.css
remove .right and .center, they don't seem to be in use
spaces to indent comments, not tabs
various grammar, HTML, and formatting tweaks for the about and contact modals
clamping.. screwed up seeking though
реализован интерфейс для magicSquare
converted most parts to multimob
changing to cribum
Maybe should implement Popen.poll() somwhere
bugfix + icons rename
Management Console fix
Merge branch 'master' of github.com:xbadcode/Rubezh into origin_master
merge

Signed-off-by: Leeforall <545780587@qq.com>
Merge branch 'master' of git://github.com/xdj/NFCShopping into Test

Conflicts:
	WebSite/WebSite.suo
各种更新……

1.将Master移动到了Styles文件夹下，并修改各个页面对它的引用。
2.统一了数据库里表中数据项的命名（均以小写开头，如dataField）。
3.补充了优惠信息逻辑层的函数。
4.完成了商品分类页。
更新客户端Webservice实现

Signed-off-by: Leeforall <545780587@qq.com>
database
Signed-off-by: Leeforall <545780587@qq.com>
Merge branch 'Test' of github.com:Leeforall/NFCShopping

Conflicts:
	WebSite/WebSite/App_Data/Sys_DB.mdf
	WebSite/WebSite/App_Data/Sys_DB_log.ldf
忽略数据库mdf
数据字典

Signed-off-by: Leeforall <545780587@qq.com>
更新了部分BL和Webservice

Signed-off-by: Leeforall <545780587@qq.com>
试作式商品编辑/添加网页完成！
Merge pull request #10 from EternalWind/master

试作式商品编辑/添加网页完成！
Signed-off-by: Leeforall <545780587@qq.com>
Merge branch 'master' of github.com:Leeforall/NFCShopping
Signed-off-by: Leeforall <545780587@qq.com>
添加了商品页以及相应的删除操作
Merge branch 'master' of git://github.com/Leeforall/NFCShopping

Conflicts:
	WebSite/WebSite/BLL/SuggestionBL.cs
	WebSite/WebSite/BLL/UserBL.cs
	WebSite/WebSite/DAL/ReviewRepository.cs
	WebSite/WebSite/DAL/UserRepository.cs
Merge pull request #11 from EternalWind/master

添加了商品页以及相应的删除操作
测试了发送反馈信息和评论信息的接口

Signed-off-by: Leeforall <545780587@qq.com>
Merge branch 'master' of github.com:Leeforall/NFCShopping

Conflicts:
	WebSite/WebSite/DAL/ReviewRepository.cs
	WebSite/WebSite/DAL/SuggestionRepository.cs
	WebSite/WebSite/NFCShoppingWebSite.csproj

Signed-off-by: Leeforall <545780587@qq.com>
暂时还有部分缺漏

Signed-off-by: Leeforall <545780587@qq.com>
Merge pull request #98 from asahan/master

과제입니다.
Git & GitHub
Merge pull request #374 from wheneveryousad/master

마지막 과제 제출합니다..!!
Detail
Merge pull request #211 from gwoni/master

디테일 과제 제출합니다
Merge pull request #918 from xillibit/bugs2

#914 Backend: Fatal error in Trash Manager
Fix a bug where new indication wasn't working after upgrading from K2.0
Merge remote branch 'upstream/master'
Fix #919: Access Denied When Deleting Only Post In A Topic
Merge pull request #921 from mahagr/master

Fix a bug where new indication wasn't working after upgrading from K2.0-RC
#908 K 2.0.0 configuration report does not show integration settings
#1211 bug: Add pagination on announcements list 
#1211 bug: Add pagination on announcements list (fix regression)
Convert file to LF format
Bug : SQL issue in ordering items in attachment manager in backend
#1216 Guests are shown vote screen, but aren't allowed to give vote
Merge pull request #1229 from xillibit/bugs11

Set version to 2.0.4-DEV 
Merge pull request #1231 from xillibit/bugs9

Bug : SQL issue in ordering items in attachment manager in backend
#1211 bug: Add pagination on announcements list (update)
Fix fatal error (typo) in Finder - Kunena Forum plug-in
Fix invalid HTML from the diagnostics tool
Merge remote branch 'upstream/2.0' into 2.0
Joomla! 2.5: Fix fatal error (JFile) when migrating from Kunena 1.7
Fix #1220: Upgrading Kunena 1.7 to Kunena 2.0.3 breaks topics
Merge pull request #1243 from mahagr/2.0

Fix #1220: Upgrading Kunena 1.7 to Kunena 2.0.3 breaks topics and some smal issues
Fix #1226: UTF-8 issue in quote BBCode
Merge pull request #1244 from mahagr/2.0

Fix #1226: UTF-8 issue in quote BBCode
Update broken image in readme file
Better way to escape javascript strings

Affects (testing needed in):
* Installer redirects
* Quickicon link to upgrade Kunena
* Administration: Configuration reset modal box
* Administration: Ranks and smilies dropdown (changing icon)
* Preview (can fix preview in special URLs)
* [map] BBCode
* User search autocomplete (both in search and user list)
Merge pull request #1251 from mahagr/2.0

Better way to escape javascript strings
Fix #1206: Announcement breadcrumbs are wrong
#629 Find a way to prevent downgrade (also K1.7)
#633 Default language is missing in generated report
Merge remote-tracking branch 'upstream/master' into bugs2
#629 Find a way to prevent downgrade (also K1.7)
#658 Configuration option missing for default message sort order
#656 Backend General Statistics
#659 Display category name when editing one 
#654 Joomla debug console and Kunena reinstalling 
#650 Kunena 2.0 css (category lastpost)
#650 Kunena 2.0 css (Backend: Config)
#650 Kunena 2.0 css (logout button)
#668 Feature: Add poll on rows 
#669 Feature: Add Preview button 
#650 Kunena 2.0 css (checkbox announchment)
#668 Feature: Add poll on rows (part 2)
Merge pull request #643 from xillibit/bugs2

#629 Find a way to prevent downgrade (also K1.7)
Merge pull request #661 from xillibit/bugs4

#658 Configuration option missing for default message sort order
Administrator: Cleanup configuration view, fix small bugs
Merge remote branch '810/master'
Small adjustments to @810 commits
Remove the bin folder.
add reg_setup_dev
add debug_level file:main.h
clean colors directory and add some color submodules
Adding Schema::rename('oldtable','newtable') support

Signed-off-by: Colin Viebrock <colin@viebrock.ca>
One more change (comments may need to be altered)
Signed-off-by: Colin Viebrock <colin@viebrock.ca>
Fix ... thanks Vespakoen!
Merge branch 'feature/installation'
Input::has_file was not working properly.
This one should work perfect :)
Fix anchor name for "Retrieving a language line" section on localization page.
Merge pull request #905 from franzliedke/patch-19

[Docs] Localization page: Fix anchor name
Merge pull request #903 from Lapayo/master

Fixed a little bug with the Input::has_file function
WIP.
Add note about making view directory writable.
Extend Auth::laravel to accept multiple params to verify

Signed-off-by: Jeffrey Way <jeffrey@envato.com>
Add "remember" to ignore list

Signed-off-by: Jeffrey Way <jeffrey@envato.com>
tweak eloquent model change method to not check types.
Fix typo in comments
Quick notes on Pivot tables
added option for URI languages.
updated change log.
clear out langauges option.
tweak url for languages.
added server configuration to the documentation
マルチディスプレイ対応 (その 1). #56

popup-string, popup-list, msgbox, dialog-box で画面からはみ出さないように
ワークエリアを取得して位置を調整している。

ワークエリアは SystemParametersInfo に SPI_GETWORKAREA を指定して
取得していたが、これはプライマリモニタのワークエリアを返すため
常にプライマリに表示されていた。

MonitorFromWindow, MonitorFromRect, MonitorFromPoint で取得した
モニタに対して、GetMonitorInfo でワークエリアを取得するように変更。

マルチモニタ環境で常にプライマリの
Merge branch 'feature/multidisplay-support' into develop. #56
Add format attribute to log functions
Fix format string warnings.
Fix misnamed spec file
use activerecord 4.0 and init migrations
init migrations
migrate models to pg
完成搜索用户
pristine-tar data for ruby1.9.1_1.9.3.194.orig.tar.gz
不用な画像を削除
Don't show auto-flattr errors
Remove inline flattr buttons and dialogs

Can be removed now that we have auto flattring.
ignore case when searching for Facebook users.
compute (derived) theta elements for ordinal variables after the parameters have been estimated (as a side effect, rsquare=TRUE now works for ordinal variables)
正常化？
posting about music camp 2012
Forgot to mention Zappa-simple.js
Restore the minimized version of socket.io.
minor doc formatting
Removed `@stylus`; added `@with` to allow in-code Zappa changes.

From an API perspective, it makes no sense to mix the code that creates the server (host, port, https) with the semantics of the callback.
The callback should be self-contained, and if it requires `stylus`, `less`, `eco` etc. it should be able to request them on its own, without creating a dependency on how it is called.
Hence the new `@with` API, which replaces the old `(require_)css` option of `zappa.run()`.

Regarding the removal of `@stylus` the rationale is that coffee-css is the default styling engine due to plain coffee-script inclusion. (There's no ambiguity when you're calling `@css` whether we're dealing with plain CSS or coffee-css.)
`stylus` no longer has a preferred status, it should be declared like any other stylesheet template engine.
add random picker
add option items
temporarily disable figure adding form
my emacs help
Catptcha.random: pseudo-random order by key
Luokkia hieman täydennetty
Adding proper chat whispering.
Merge branch 'master' of github.com:zimothy/comp103
提交到主版本
Merge remote-tracking branch 'oflow/master'

Conflicts:
	src/main/webapp/WEB-INF/pages/process_defi/list.jsp
test
added default files for login and settings as reference to be incoporated into existing files
Apply some board styles
Add resource id of country (if known).
Download css as separate files, so that relative img paths are ok.
new API to post to network
update README
updated Cannonball, add items to InGame, change Settings, updated Welcome
added own Matrial class as instance of nape.phys.Material
updated control, settings, added raw control-switcher
updated ingame
Set client default port to match server default port
Refactor Controller Client to use new GUI widget
Moved source code files into version folder
Snapshots of older developmental versions
delete print json
Removed createWebsite from deploy helper.

Not such a good idea after all.
WINKSTART-889: On Register/on-board, if Password / Confirm Password don't match it tells you
WINKSTART-717: Changed button's label in Callflow.
Center code page
added atan2 in precision
Version bump to 0.2.5
Update gemspec
Update notes for submitted changes

* Add Sprint System Settings for PRL and Profile update
Checked that everything runs, ready to merge into dev
Problem 7 tidied
Add .gitignore to ignore Eclipsify files
Enh: change notes displayed in NoteList
Fix: map description field as a BLOB
allow groups to be empty
tried to log migrate version on shard itself
update code
restrict to reset shard
Merge remote-tracking branch 'yonggu/master'

Conflicts:
	lib/octopus/migration.rb
I deem this pretty much worthy of usage, and expansion.
sprunge: re-write
ui.vim: show tabs and trailing spaces