labofsahil/github-event-dataset-2012 huggingface dataset:
Change to the max of ideal price or 1000 * goods.

This means that purposefully overpaying is still capped at 1000 per
good, however if the goods are meant to cost that much then all of it
still goes into upgrade.
Increase upgrade by 10 * goods traded.

This allows for upgrading to happen through heavy trading of a port,
rather than being limited to pretty much purely purposeful upgrading
(hopefully making racial trading a bit more dynamic through the round).
Change port defense calculations.

Upgrade is no longer added after reaching max level (cannot upgrade any
further and do not want the additional defences from it).
Credits in the port now add 500 shields/armour and 50 CDs per 10mil,
this means that a port with loads of money in it will have increased
defences to max and will not lose the defences from excess money when
downgrading (as it would with being over upgraded).
Change Trade-Master to 7 speed, 345 holds.

This will keep it's trade power roughly the same whilst allowing it more
mobility.
Switch to 10 SMR credits per dollar.
Change exp to be holds / 13 rather than / 15 + 2.

This means that experience gained is much more closely related rather
than the situation we have now with the Stellar Freighter getting the
same experience per trade as the Freighter which has 25 more holds, but
the Leviathan gaining 11% more experience than the Freighter by having
only 5 more holds.
Key comparisons in the old system:
ACV was equal to the ACV.
SF was equal to the Thief.
PT/DS better than the ATM.
Amba much better than the IST.
Make referal/joining reward credits relative to $

This means they have increased relative to match the new
CREDITS_PER_DOLLAR value.
Initial commit
Merge branch 'master' of github.com:snaypsp/test
Circular buffer if/else brackets made less confusing
Require hspec >= 1.3
Use Hspec's `shouldBe` instead of HUnit's @=?
* Added bazier function to point movement
* Made character attack in demo using new function
Tidied up, improved README and added example
Make sure 'clean' also removes messy temporary files.
debian/: use maven3
removed 'throws' in main method
Bsdmodule: Check result of uniqueify() and steal_m() before sending packet.
upgrade event timers to allow specification of timezone and offset in HHMMSS. closes #23
Maintain wording consistency
changed tag cloud query to be compatible with postgresql
fixed timing bugs; sustain tweaks
marks new 125bpm sounds
particles
Merge branch 'master' of github.com:stevesan/hbb
stuff
display chinese characters
Add find method to User model
Switch to eco templates
Remove old jade views
first commit
:
modify bug
增加字库索引支持非全字库并兼容之前格式的全字库
增加字库索引支持非全字库并兼容之前格式的全字库2
multiple TLV in one string ok.
start with webserver
Merge remote branch 'zini/master' into sound
Merge remote branch 'swick/initocfg'
compile fix
silence an error regarding faced handle
Merge branch 'master' into occlusionquery
fix for pickup up transparent objects, workaround for doors
player check
don't create sky until entering an exterior cell
changed the cloud movement direction like suggested on the forum
Feature #37 (In Progress) Render Path Grid
optimisation, now it takes only two batches per cell.
Feature #37 (In Progress) Render Path Grid
tuned sized a bit
Merge remote-tracking branch 'upstream/master'
Merge remote branch 'scrawl/weather'
Merge remote branch 'kromgart/master'
Make sure it doesn't find the wrong file
Fixing an ambigous symbol
Don't set an underwater environment when there's no water
Implement an Audiere-based decoder
Merge remote branch 'scrawl/occlusionquery'

Reduced cout spam

Conflicts:
	apps/openmw/mwrender/occlusionquery.cpp
Merge remote branch 'chris/sound'
added reader and tests for new solinst csv file format including barometers
bump version number to 0.2
Added a new file

Progress.txt
Remove line-length limit from XML files
Makes dotfiles reload force a reload of the environment configuration
Updated at Tue Aug 21 04:21:43 JST 2012
class is a group of objects with similar behaviors.
String with no reference count feature
add m2e configuration for antrun plugin
update version tag to 0.7
Removed maven build.
[ update ] README: ydes, source tree
Initial commit for Clipboard Catcher
alarm: Move to python3
clipcatch: Add licence info
ehelper: Move to python3
Merge branch 'master' of github.com:thammi/stuff
Removing un-needed files
Removed un-needed files.
read_attribute is public [ci skip]
Changeing some code-styles of the examples & fix a typo on dependent option
Merge branch 'master' of https://github.com/lifo/docrails

Conflicts:
	activerecord/lib/active_record/callbacks.rb
Fix code example in AR::AttributeMethods::BeforeTypeCast.
convert comments to 1.9 hash syntax
Add tests to make sure that the I18n taken message can be overrided in the
activerecord scope.

Related with 5341b84936d93ec90e6252af437a3871101c115a
fix output messages - docs [ci skip]
frozen state should be restored after txn is aborted
Fixed typo on ActiveRecord nested_attributes.
pass the key to the block in cache.fetch on misses
changed test case name
Merge pull request #8014 from insside/task-test-typos

changed test case name
Another batch of hash syntax changes to comment, this time around, I tried to keep 'output' messages untouched.
Updated activerecord test comments to new hash syntax
adds Rails to the title of the JS guide [ci skip]
renames the JS guide file name to match the new title [ci skip]
JS guide: AJAX -> Ajax

We discussed this on Twitter, seems to be the best option.
registers the JS guide in the CHANGELOG [ci skip]
JS guide: applies guides casing guidelines for titles [ci skip]
Migration of docs to 1.9 hash syntax
crated new folder doc
Beginnings of video player.
Merge branch 'dev' of https://github.com/thebluber/S3 into video
Tweaked showpoints
Merge branch 'dev' of https://github.com/thebluber/S3 into video
Finish video player.
Tweaked showpoints (scoreDisplay)
Merge branch 'video'
Add outro test video.
Update textures
merge hennings changes and fix textmessage alignment bug in HUD
Added.
added
added
- Fix unittests.XPClassTests::thisIsNotSubclassOfSelfClass() on WSH
- Exclude magic methods
Added chainability and contextualizing to the plugin.
back to exec and some whitespace
poster
Merge branch 'master' of github.com:timko/FreEdu
final calls output file now always has .vcf on the end of it
fixed the versions being printed in the various outputs. Now forces output to be .vcf.
results model eval edits
open with support.
Fix call to Layer constructor.
Merge branch 'develop' of https://github.com/boto/boto into dynamodb_additional_exceptions
update to reflect fix to layer costructor in 9d2a09e
shrink width of example-1
site improvement
tested
set exact versions for dependencies
improvement of site
added filter to children function
added siblings
README
Image download resource problem solved (?)
Possible set log-level in LogFormatter.dropped and LogFormatter.scraped
Log level return from LogFormatter methods
Merge pull request #214 from tonal/log-level-dropped-item

Make LogFormatter return the log level (and require it)
Merge branch 'master' of https://github.com/scrapy/scrapy
Updated _posts/2012-09-19-ogn28.markdown
CRM-10660 - Rename "generate:report" to "generate:report-ext", freeing up "generate:report" for use with the better practice of "reports-inside-modules"
CRM-10660 - Implement "generate:report" which adds a new report class/row to a module
julka
Merge pull request #658 from akoumjian/develop

Added marketplace fee parameters.
Merge pull request #660 from jreese/develop

Fall back to plain text launch config user data
Merge pull request #662 from tpodowd/fix_location_constraint

Fix typo in XML for bucket location constraint.
Manually merging fix into develop branch.  Fixes #624.
Merge branch 'develop' of github.com:boto/boto into develop
delete_key() now returns information on what was deleted.

- delete_key() now returns a key object. The key object contains
  informatation on the version_id that was created or removed and
  if a delete_marker was created or removed.
Merge branch 'develop' into all_toms_fixes
Merge branch 'deleted_key_info' into all_toms_fixes
construct unit
remove no use file
Run --server as a daemon
Update .gitignore
Fix log message of --server
Enabling Ebean
Found the right way to handle FactoryBeans when doing Spring java-config
More necessary fields on domain object AbstractRecord
Reuse, reuse
fixed import
Removed unused legacy persister. Persister is now injected, instead of an argument
Removed old functionality that is now replaced by ebean
Merge branch 'feature/ebean' into develop
added word numbers
now takes multiple groups

still some work to do:
1. titles on the network plot
2. netwrok.graph to network.plot
3. take extra coloring lists of words
Headers fixed1
Headers3
install step 3 - phase 1
HBASE-6685 Thrift DemoClient.pl got NullPointerException

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1379010 13f79535-47bb-0310-9956-ffa450edef68
HBASE-6291 Don't retry increments on an invalid cell

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1379076 13f79535-47bb-0310-9956-ffa450edef68
HBASE-5372. Table mutation operations should check table level rights (Laxman)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1348466 13f79535-47bb-0310-9956-ffa450edef68
HBASE-6157. Revoke of Global permission is not taking effect without restart (Laxman)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1348468 13f79535-47bb-0310-9956-ffa450edef68
HBASE-7046 Fix resource leak in TestHLogSplit#testOldRecoveredEditsFileSidelined (Himanshu)



git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1407363 13f79535-47bb-0310-9956-ffa450edef68
Decreased font size in infoWindow
Compress libraries
Added untracked file
Set max width for infoWindow.
Add new renderer [should have been in last commit]
#o2js typo fixes on README.
Clean and comment actions, create SetAttributeAction module and revert ClipResizeAction
start models development
change file names and etc
Merge branch 'dev' of https://github.com/vchub/bid_op into dev
remove pictures
add .worksheet to .gitignore
update themes
fix log out
specialize version on linux
Add PageBlocks class.
Change PageBlocks to singleton.
Reverted f5/f6 change
selecting redblack algorithm produces the same results as hashtable but
the algorithm it self is currently only normal bst not rbt
merge from origin/master.
code fixes, debugging save to local storage, and edit, delete items.
code corrections according styleguide №2
TESTS: Added one more test on updateExistingItem
- Also fixed a little bug
Fixed extras episodes view
optimizate the linear fill for gl
removed some overly eager logging statements
alternative (commented) code hidden behind an ifdef
usprawienie kreatora wykresow oraz dodanie kilku nowych wskaznikow
For J
deleted:    bin/AndroidManifest.xml
	deleted:    bin/classes.dex
	deleted:    bin/classes/br/com/wjaa/medroid/BuildConfig.class
	deleted:    bin/classes/br/com/wjaa/medroid/InputController$Clean.class
	deleted:    bin/classes/br/com/wjaa/medroid/InputController.class
	deleted:    bin/classes/br/com/wjaa/medroid/LoginController.class
	deleted:    bin/classes/br/com/wjaa/medroid/MenuController.class
	deleted:    bin/classes/br/com/wjaa/medroid/R$array.class
	deleted:    bin/classes/br/com/wjaa/medroid/R$attr.class
	deleted:    bin/classes/br/com/wjaa/medroid/R$drawable.class
	deleted:    bin/classes/br/com/wjaa/medroid/R$id.class
	deleted:    bin/classes/br/com/wjaa/medroid/R$layout.class
	deleted:    bin/classes/br/com/wjaa/medroid/R$string.class
	deleted:    bin/classes/br/com/wjaa/medroid/R.class
	deleted:    bin/classes/br/com/wjaa/medroid/spider/Atributos.class
	deleted:    bin/classes/br/com/wjaa/medroid/spider/Dados.class
	deleted:    bin/classes/br/com/wjaa/medroid/spider/MinhasEconomiasPutter.class
	deleted:    bin/classes/br/com/wjaa/medroid/spider/Session$1.class
	deleted:    bin/classes/br/com/wjaa/medroid/spider/Session.class
	deleted:    bin/classes/br/com/wjaa/medroid/spider/SessionFacade.class
	deleted:    bin/classes/br/com/wjaa/medroid/spider/SessionValidate.class
	deleted:    bin/classes/br/com/wjaa/medroid/spider/Transacao.class
	deleted:    bin/classes/br/com/wjaa/medroid/spider/Usuario.class
	deleted:    bin/classes/br/com/wjaa/medroid/spider/Values.class
	deleted:    bin/classes/br/com/wjaa/medroid/spider/adapter/ItemAdapter.class
	deleted:    bin/classes/br/com/wjaa/medroid/spider/exception/SessionException.class
	deleted:    bin/classes/br/com/wjaa/medroid/spider/vo/Categoria.class
	deleted:    bin/classes/br/com/wjaa/medroid/spider/vo/Conta.class
	deleted:    bin/classes/br/com/wjaa/medroid/spider/vo/Item.class
	deleted:    bin/classes/br/com/wjaa/medroid/ui/thread/FechaDialog.class
	deleted:    bin/classes/br/com/wjaa/medroid/utils/MobileUtils.class
	deleted:    bin/classes/br/com/wjaa/medroid/utils/ViewUtil$1.class
	deleted:    bin/classes/br/com/wjaa/medroid/utils/ViewUtil$2.class
	deleted:    bin/classes/br/com/wjaa/medroid/utils/ViewUtil$3.class
	deleted:    bin/classes/br/com/wjaa/medroid/utils/ViewUtil$4.class
	deleted:    bin/classes/br/com/wjaa/medroid/utils/ViewUtil.class
	deleted:    bin/jarlist.cache
	deleted:    bin/minhaseconomias-droid.apk
	deleted:    bin/res/drawable-hdpi/icon.png
	deleted:    bin/resources.ap_
	deleted:    gen/br/com/wjaa/medroid/BuildConfig.java
	deleted:    gen/br/com/wjaa/medroid/R.java
GUI: changed captions in two file dialogs
GUI: handle Ctrl-C in Data > Table, context menu with "Copy"
GUI: refactoring, dialogs.cpp splitted into fitrun.cpp and merge.cpp
added checkbox "fit separately" to Fit>Run dialog

allow "fit +" (without number) in fityk parser/runner,
and minor changes to the Fit class interface
default value for "separately" in Fit > Run and also command generated

by button Fit on the toolbar are depend now on weather models in
different datasets share variables.
Merge pull request #2 from woldman/master

reformat README.rst
Reformat README.rst
Rename weiners.py to __main__.py
Remove addition of previous value in SHR3
add seed file for debugging
Use SWB instead of SHR3 for rng in RANDNORM_NORMAL
Experiment with changing randnorm.h
Use numpy.random.randn instead of RANDNORM_NORMAL
Use numpy.random.random instead of randn for speed
remove local glv, use github to download instead
added features/attendance
Updating scope of modules to Example for xpd
Fix webdav move and locks
Add the dialog for editing.
rename to md ext
- comentario objecto
- voto objecto
xbps_dictionary_from_archive_entry: faster when plist is already uncompressed.
Version 1.2.3.0
修改导入
Merge branch 'master' of git://github.com/dotless/dotless

Conflicts:
	src/Dotless.nuspec
	src/dotless.Core/Importers/Importer.cs
	src/dotless.Core/Parser/Tree/Import.cs
	src/dotless.Core/Parser/Tree/Ruleset.cs
Importer
Merge branch 'master' of git://github.com/dotless/dotless

Conflicts:
	src/dotless.Compiler/dotless.Compiler.csproj
	src/dotless.Core/Importers/Importer.cs
	src/dotless.Core/dotless.Core.csproj
	src/dotless.SampleWeb/dotless.SampleWeb.csproj
	src/dotless.Test/dotless.Test.csproj
	src/dotless.sln
Set up player stats, now to just set them to things and save them somewhere
get promoted
se agregan herramientas
Implemented max/min_date checks on next/prev month clicks
avoiding ByteString.Char8.
avoiding ByteString.Char8.
Defining PESSIMISTIC_RECV.
bug fix of hasBody.
Merge pull request #107 from kazu-yamamoto/refactoring2

Refactoring2
Objects utilities. Filtration and iteration
Add TOTOs in README file
Site updated at 2012-04-23 08:10:07 UTC
Removed the list of excluded words to fit ours needs
Continued working on shuffle feature including randomly selecting songs.
Configuracion de HMVC y .htaccess lista
png object is smaller
support fixed strings
make ajax request cache=false
prevent ctrl-C in ipython from causing classfier to change its class.
check bug
Merge branch 'master' of github.com:zifter/prv13
We released a version after changing the fil stream to url.

  But there is still that weird java error. I don't think we can fix
that, without even knowing what it is..

In any case, the new version is 0.0.21.
settings
change settings
beast ptyhon update (ernst.py works now, add couple lib get* functions binding)
Build module working on Mac OS X

Have some code cleanup to do and also test a small change I made for
Windows.
make the magic generator
add logging and better manage friends and follower requests
make test_user handle followers and friends as generators
allow magic function cache to ignore certain keyword args
allow user to to be returned by either username or id and make friends and followers cache driven
Merge branch 'generator_for_friends_and_followers'
fix formatting issue
enable favoriting and unfavorting
add user can favorite
tie together the oauth tests and test adding user favorites
add ability to ignore tests that are annoying to run, like liking a photo
add in ability to like a photo and factor out photo id lookup
add ability for a user to like a photo based on photo id
test for whether a user can like a photo
Merge branch 'user_votes_favorites'
allows for fancy photo comments
photo comment to module
fix off by one error as well as add a convience method
add the ability to get photo comments
fix user tie in and add photo_comments to photo as a magic gen
Week 7 updated files
Changed earthquake model to show number of displaced people on map
Make qgis stdout very quiet for shakemap script
Realtime mapping updates and city computation logic improvements (in progress).
Changed Category Hazard Building and associated mode
renamed app.js -> server.js & jasmed.js -> client.js
TESTING?
G channel of HGB fixed
iE to wall :trollface:
SlowTimePainter.java was implemented
WiP - track cleanup and optimization, Legend clean up etc.
French translations

Signed-off-by: Julien TANT <julien@ao6-labs.eu>
adds credit for the sticky footer
tweaks formatting
reel done
Добавлен пункт меню Акции. Немного видоизменены переключатели языка. В модели продукта увеличина длина поля до 500 знаков.
4 test:functionals errors left
controllers for sessions & admin added
disable 'in' type
add an output helper for shared output
add app show and use the app output helper in domain
Stub correct object.
Stub REST client
Somehow stubbing here is not working. Changed the output to match, since the existing matchers test what the stub should return, but the output from the wizard.
Stub REST client call.
Stub Wizard#get_preferred_key_name here. I'm actually having a hard time actually stubbing a minimally appropriate method here; the subsequent "$terminal.write_line" 'yes' in this situation should result in accepting 'default' as the key name, so stub that instead as a compromise.
[FIX] GUI, Explore Area: correct query composition with attributes
[MOD] travis-ci should only test the master branch
[FIX] Core: database instance creation reverted to be lazy
Merge branch 'master' of github.com:BaseXdb/basex
[FIX] GUI/Core: GH-459, GH-465: update database list
[MOD] minor cleanups
[MOD] IO: Copy.copy() changed to IOFile.copyTo()
[FIX] Core: finalization of updates and flushing revised, minor fixes
merged with master
Merge branch 'locking' of github.com:BaseXdb/basex into locking
Revert "WorldTp"

This reverts commit 05864e80e858974e4cf99d347ff4ebf91c0a5c70.
bugfix for total runtime calculation if a factor was found in a restarted run
sieve timing, allow for fix or variable sieve size
Detecting the response of the user in the manual schema importer
Fixed NextPlex URL Slug to Updated, Clean, SEO friendly Slug
Desktop_client. Delete the desktop_client_inprogress
Fixed a bug in where the lua_regex was created.  Added a "Do not colour" switch
Merge branch 'master' of github.com:Bradbev/qgrep
Updated the hashtag plugin
god cant post msg on world they are not admin
changed up menu links and fixed some merge issues
Updated XDebug to 2.2.0, fixed #58.
Going to have to implement chunks as separate files.
#20 Design fix
#20 Diary-All and Diary-Friend Design
Add commit for 26da17f5083969be2039cf673b86efb4f4d43033
#2224 Deprecate cuboid mesh construction with Tetgen (in favour of hard-coded fully structured version).

git-svn-id: https://chaste.cs.ox.ac.uk/svn/chaste/trunk@17290 b5f69653-2bf5-0310-8201-b0dafb8e1405
make test pass on a random new machine

git-svn-id: https://chaste.cs.ox.ac.uk/svn/chaste/trunk@17293 b5f69653-2bf5-0310-8201-b0dafb8e1405
added buttonMode = true and made positioning buttons in settings work

Positioning buttons now have hover effects. Used the least amount of
functions I could think of.
更改代码文件结构。增加文件操作和基本变换的消息显示。修正一些小的错误。

Signed-off-by: CyberZHG <443442708@qq.com>
QUASAR: WIP for #536

Random chinese characters are being added to the setName string of any
created portset inside of the honeydConfigManage page. I don't know why,
hoping a restart will take care of it and it'll be working fine.
NOVAD: Optimize reading training data from a pcap file

Leave output file open during entire pcap read
Don't launch DHCP honeyd watch thread
Don't iterate entire table when only single suspect changed
Don't send suspect to UI more than first time it's seen
Don't update suspectsSinceLastSave
DOC: Delete incorrect/outdated function comment
stairs are finally (mostly) working
(aka. look at my stairs, my stairs are amazaing)
improved the code for content negotiation
Unused file Removed.
allow "rest" argument of type Array<Expr> as last macro argument (fixed issue #733)
use top-down inference on macro calls (fixed issue #452)
better handling of macro rest argument
Move up Stylize plugin
Go Up button, Anchors in portfolio, Fix menu style & Gallery
Version 2.1
Loot: Fixed nun endgültig den Loot exploit.
Update consoleUI.py - Rename extractRegexSign
created seperate proto for mouselook

still not working
sws/x86: add some forgotten 12bit planar yuv cases

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
sws/x86: add av_assert() to ensure 16bit code is used with 16bit data

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavf: remove unneeded pb check

Fixes CID747727
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
build: Move all arch OBJS declarations into arch subdirectory Makefiles.
git-howto: Explain how to avoid Windows line endings in git checkouts.
movenc: Remove a dead initialization
ffv1: Fix size mismatch in encode_line.
h264: fix 10bit biweight functions after recent x86inc.asm fixes.

This should have been updated in the x86inc.asm update, but was
accidently forgotten.
vp3: Assert on invalid filter_limit values.

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
pthread: Fix crash due to fctx->delaying not being cleared.

Reproducible with test case and ffplay -threads 2. Stack trace:
http://pastebin.com/PexZ4Uc0

Test case:
http://commondatastorage.googleapis.com/dalecurtis-shared/crash.ogm

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
matroska: Fix leaking memory allocated for laces.

During error conditions matroska_parse_block may exit without
freeing the memory allocated for laces.

Found via valgrind: http://pastebin.com/E54k8QFU

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
ac3dsp: call femms/emms at the end of float_to_fixed24() for 3DNow and SSE

Fixes ac3-encode and eac3-encode FATE test failures with SSE2 disabled.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
configure: escape colons in values written to config.fate

The fields in config.fate are colon-separated so any colons
within the fields should be escaped to prevent confusion.

Signed-off-by: Mans Rullgard <mans@mansr.com>
faxcompr: Check malloc results and unify return path
tiffdec: Add a malloc check and refactor another.
swscale: K&R formatting cosmetics (part II)

Also adjust some comments including wording and typo fixes.
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: K&R formatting cosmetics (part II)
  tiffdec: Add a malloc check and refactor another.
  faxcompr: Check malloc results and unify return path
  configure: escape colons in values written to config.fate
  ac3dsp: call femms/emms at the end of float_to_fixed24() for 3DNow and SSE
  matroska: Fix leaking memory allocated for laces.
  pthread: Fix crash due to fctx->delaying not being cleared.
  vp3: Assert on invalid filter_limit values.
  h264: fix 10bit biweight functions after recent x86inc.asm fixes.
  ffv1: Fix size mismatch in encode_line.
  movenc: Remove a dead initialization
  git-howto: Explain how to avoid Windows line endings in git checkouts.
  build: Move all arch OBJS declarations into arch subdirectory Makefiles.

Conflicts:
	configure
	libavcodec/vp3.c
	libavformat/matroskadec.c
	libavutil/Makefile
	libswscale/Makefile
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
dfa: fix out of array write in decode_wdlt()

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
dfa: Fix out of array write in decode_dds1()

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
MDL-18301 Gradebook: Added callback for components to control grade visibility
fixed: group columns when set to 3 for example were rendering columns of 2, and were being messed up when hidden elements in the group
Removing 'required' attribute for 'id' in form.xml, j3 branch
replacing deprecated php spit with explode
changed redirect plugins admin settings layout
updated form rest plugin - was totaly hardwired to the original clients options, so added those as params, defaulting to hardwired settings
fixed: pdf list view in admin not working
made a minor GUI setup
Fixed some concurrency issues and other stuff
Fixed a lot of crashes in the edit mods form.
All tasks are now cancelled when the main window closes.
网络部，柯肇丰9月28
delete the auto files
Updated readme to reflect project progress
Updated readme to reflect progress
Now acquires summoner spell data
Correction de l'inscription (ne fonctionnait plus à cause de l'UTL Rewriting)
Mise à jour des tables Friends (attention, il faudra supprimer l'ancienne table Friends)
articles template fix
Rename the installer.
Rename the installer.
Send join messages with the DCC chat control
ツールバー非表示を削除
cond_signal () now wakes up threads according to priority.
Bozza della lista principale
Implement progress failures

I took the liberty to improve the obvious failure cases where a red progress
bar would be useful.
Implement client window flashing

This will be used in python to grab the player's attention on PMs or other
interesting events.
Sample functions for calling after adding features

We have added example functions for the two ways
of calling a function after adding a feature: as
an event listener, and as a parameter of the con-
trol.
hiu
hhydd
wqe
fixing some MySQL related syntax problems
fixed app startup for nowjs
Finalized background image
Removing a dangerous alias.
Reindenting after snippet expansions in Ruby.
readme falsch
Updated javescript and corrected html file.
Created tests for @require and @include functions.
Update README.md
Exclude dlm and xsi prefix

Also remove other xml-related attributes from <html>
HTML5 charset meta tag
Removed language attribute from script tag
Skip links now referencing container IDs
Removed name attributes from portlet titles

I couldn't determine officially if this attribute was currently beings used as a reference anchor or not, but in any case, the ID can be used in place of it (the name attribute is obsolete these days).
White space...
Fixed improper anchor nesting

Fluid's inline edit component was generating an anchor tag inside the anchor tag for the tab, which is a big w3c no-no. Since the component did not have a option for the markup, I copied the source function into up-tab-mange.js and made the change directly. It now generates a span tag for the button instead of an anchor.
Fixed improper anchor nesting

The inline edit fluid component was generating an anchor inside the anchor for a tab, which is a big w3c no-no. So, I copied the source function into up-tab-manager and changed the anchor to a span, instead.
Merge branch 'master' of git://github.com/Jasig/uPortal into UP-2925

Conflicts:
	uportal-war/src/main/resources/layout/theme/universality/components.xsl
	uportal-war/src/main/resources/layout/theme/universality/content.xsl
	uportal-war/src/main/resources/layout/theme/universality/page.xsl
	uportal-war/src/main/resources/layout/theme/universality/universality.xsl
Ousted longtime notorious antagonistic tooltip...
Fixed inline edit input tag improper nesting

The inline edit fluid component was injecting an input tag within the tab anchor (another w3c no-no). I've now changed this so that the markup gets injected next to the tab anchor and then to also hide the anchor while editing. This required some styles, too, so I added a fl-inlineEditContainer class and updated each skin's portal.css
Merge branch 'UP-2925' of github.com:jdlich/uPortal into UP-2925

Conflicts:
	uportal-war/src/main/webapp/media/skins/universality/common/javascript/uportal/up-tab-manager.js
Moved UP-3361 styles into sass...

If you edit the portal.css files directly, they will get clobbered when the sass is compiled!
Moved gallery category container div outside ul
Added back lang attribute to html root

I don't believe xml:lang is needed since we're no longer dealing with XHTML, but with HTML5
Added back IE-related meta tag
Merge branch 'master' of git://github.com/Jasig/uPortal into UP-2925

Conflicts:
	uportal-war/src/main/resources/layout/theme/universality/page.xsl
Merge pull request #35 from jdlich/UP-2925

UP-2925: Ensure uPortal theme passes validation
more util languages
fix j.m.build.packaging.mps.pluginSolution
regen
get rid of empty jetbrains.mps.gtext.pluginSolution; regenerate mpsautobuild
carpeta ucp dentro de web .htaccess
fix compiler errors for good

include stdint.h in abstractfunctionoverwriter.h to get intptr_t
but also define __STDC_LIMIT_MACROS there to have it available
in unixfunctionoverwriter.cpp
Recycler: Removed Refresh when opening bin.
Unnecessarily displayed 0 for 10 updates when opening bin.
Ninja: don't pollute build dir with preprocessed rc files
Ninja: Eclipse and KDevelop fixes for ninja

Thx to Claus Klein
Merge topic 'ninja-cldeps' into next

2fb07fc Ninja: Eclipse and KDevelop fixes for ninja
518c065 Ninja: don't pollute build dir with preprocessed rc files
CPack/NSIS: Fix compatibility issues with prerelease NSIS (#13202)
CPack/NSIS: Add support for 64-bit NSIS (#13203)
Ninja: encode LINK_FLAGS to handle bash variables

Bug 13560
Port cmGeneratorExpression to cmTarget from cmGeneratorTarget.

Following from the discussion here:

 http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/3615/focus=5170
 (Re: Generator expressisons in target properties, 26 Oct 12:10)

we can't split cmTarget API for linking into cmGeneratorTarget. In
the future we will probably also need to move the include and compile
definitions API back to cmTarget so that it can be used by export().
Always use the auto_ptr from cmsys.

This is for consistency throughout cmake. The cmsys version exists
becaues uses of auto_ptr types as return types does not work with
some implementations in ancient compilers.
Split link information processing into two steps.

The first step can be ported to use the generator expression API,
while the second can not. This is for compatibility with CMP0003.
Revert "Move GetLinkInformation to cmGeneratorTarget"

As we can't move all linking related code from cmTarget, it makes
sense to reverse the move in some cases.

This reverts commit 4f5384e75c6a00d110d3fa3f555a3f6a4f31bb46.
NMake: Add a test to demonstrate EmptyDepends issue (#13392)
NMake: Fix problem with empty DEPENDS args (#13392)

add_custom_command can have empty DEPENDS arguments, which
was triggering invalid makefile generation for the NMake
Makefiles generator. We were mistakenly emitting the build
directory appended with "/" plus the empty string... which
was then translated to a string ending in \" in build.make...
which nmake choked on.

The solution is not to emit any dependency when the input
DEPENDS is the empty string. Return early from GetRealDependency
in this empty input case.
CMake: source_group needs to check its own regex after its children (#13611)

Otherwise, regexes that descend into sub-folders do not get grouped correctly.
CMake: Remove "/STACK:10000000" from default linker flags (#12437)

Modern apps that use multiple threads do NOT want 10 Megabytes of RAM
per thread being used for each thread's stack... Just leave off the
/STACK: argument, and let the compiler use a reasonable default value
for the stack size.

If existing single-threaded apps require the /STACK: argument because
they do need a very large stack size, they can add the flag in their
own CMakeLists files.
FindGettext: fix overwriting result with empty variable (#13691)

Remove stray line left by commit 656ab19b (FindGettext: remove code
duplicating FPHSA checks, 2012-09-08).
Merge branch 'FixAutomocRegression3' into release
FindBullet: Search in per-config dirs on Windows (#13738)

Bullet for windows installs in these per-config paths.
Merge branch 'fix-IMPORTED-GLOBAL-reconfigure' into release
Merge branch 'fix-FindGettext-result' into release
CMake: Fix infinite loop untarring corrupt tar file

Suggested-by: Robert Maynard <robert.maynard@kitware.com>
Merge branch 'fix-untar-infinite-loop' into release
CMake 2.8.10.2
FindBISON: Add support for the Win flex-bison distribution

Search for win_bison too.
Remove const which a few compilers claim is meaningless.

I don't necessarily agree :).
Merge topic 'generator-expression-refactor' into next

122695e Remove const which a few compilers claim is meaningless.
Restrict api
No issue: more #bookshelf's replaced with LYT.config.defaultPage.hash
Merge branch 'master' of https://github.com/mzedeler/LYT
No issue: Added missing file bg_pattern_grey.png to assets
Merge branch 'master' of https://github.com/mzedeler/LYT
No issue: replaced encodeURI/decodeURI with encodeURIComponent/
decodeURIComponent for search term to allow for equal signs
Merge branch 'master' of https://github.com/mzedeler/LYT
Merge branch 'master' of https://github.com/mzedeler/LYT
Removed supoerfluous "Genvej" from shortcut descriptions
Fixed #462 Removed superfluous call to LYT.loader.register "Searching"
in search form submit.
Merge remote-tracking branch 'kirkby/master'
fix parsing of commas inside matched quotes in string2method
force save before opening configeditor
Flattened LWP folder; should be clearer for library
Merge branch 'master' of github.com:LWPsix/LWPsix
Fix count of totalkills, todaykills and y.kills
Updating minified version, and responsive demo
Merge branch 'master' of github.com:Lane/Dropdown
made 'trim' nice
Fixed space between fact words
一、make_file_stream负责创建文件流对象，make_string_stream负责创建字符串流对象；
二、read_stream_char从流对象中读取并返回一个Character对象，其支撑函数目前仅有read_file_stream_char，负责从文件流中读取。
三、write_stream_char和read_stream_char差不多，只是功能为写入而不是读取。
增加了make_char函数——通过读取char类型的值创建对应的Lisp对象
一、增加了对lt/read-a-char和lt/write-a-char两个函数的初始化
二、预定义了*standard-output*和*standard-input*两个变量
一、修改make_symbol为make_C_symbol
二、增加了make_C_file_stream和make_C_string_stream两个函数
增加了lt_read_a_char和lt_write_a_char两个函数，它们对应于Lisp级别中的lt/read-a-char和lt/write-a-char。
一、增加了对STREAM类型对象的打印；
二、尝试使用write_stream_char和write_file_stream_integer取代原来的printf函数。
日常维护
增加make_char的声明
增加lt_read_a_char和lt_write_a_char的声明
增加了struct vector_t类型的定义以及添加一些accessor宏
新增
empty commit message
updates to Django 1.4, Leaflet and Bootstrap
Use tick boxes for picky groups. #40

Clicking on the headers is not particularly discoverable.
Private issue fix for Module.rb.
Not using ensure, because it breaks.
Merge branch 'hpi' into stefan/private-issue
Added test for issue #167.
Merge remote-tracking branch 'origin/hpi' into matthias/ruby19
Fixed Hash initialization bug.
A simple script to execute sql on CartoDB.
readme: try it!
liveness: adapt liveranges
lsra: first draft
livenesspass: handle more MateIRs
lsra: property for checking overlapping intervals

not a very efficient implementation though
liveranges: real datatype
liveranges: arbitrary instance
lsra: move into pipeline
clean up stuff...
kill some warnings
lsra: little fixes
lsra: move failing testcases to todo
codegen: forgot to guard an register usage
codegen: pattern for if
regalloc: there's some wrong usage of ebx, so remove it from free regs

until I've found the bug
regalloc: use right value for stackallocation
regalloc: remove stackCnt
ir: tag virtualReg with typeinformation
regalloc: enable gcpoints and regSaves again
more tutorial doc
potentially fix sse2 64-bit is_less and is_greater, part of bug #269
adjfun + cdiff
add NT2_TOOL_DEBUG option to build tools in debug mode
add NT2_WITH_PCH to disable PCH
fix constants in exponentbits test to use ll specifier
More Admin Theme work
fix ylim bug
added GetFull() call to return a get operation with response metadata to aid #136
Enforced fixed aspect ratio (http://www.java-gaming.org/index.php?topic=25685.new), also corrected the default best time and reduced level length
few more changes... Changing upload form slightly, fixed pinterest button, added standalone fullsize page
updated stuff & fixed #8
added backend afterSave checks, renamed layout file
fixed #5; updated the redirection to wait 5 secs
Merge pull request #9 from jgautheron/master

fixed #8; renamed files, added backend configuration checks
Moved test (as in internal test) to Perl (was in Make)
Fixed mangled project file
Fixed mangled project files.
Include fix for [9171a65b25].
Re-enable idle timer after exiting video playback. (Copy/paste error). Fixes #10582

Signed-off-by: Stuart Morgan <smorgan@mythtv.org>
Replace some more instances of concatenated strings which cannot be translated correctly.
Replace concatenated string in MythControls::ResolveConflict().
Fix incorrect deletion of a MythUIType object in MythUIButtonList::CopyFrom() which left an invalid pointer in the list of children. Refs #10807

Signed-off-by: Stuart Morgan <smorgan@mythtv.org>
Protect the MythUIType destructor to prevent it being called incorrectly. Refs #10807

Signed-off-by: Stuart Morgan <smorgan@mythtv.org>
Update additional tables for UTC.
Merge branch 'master' into devel/ceton
Send "REC_FINISHED" on correct recording.
Fixes #10685. Handle job queue properly for back-to-back recordings.
Merge branch 'master' into devel/ceton
search bar moved to header; user menu adjustment
removed class
item page setup
removed search from main.php, moved to header
adjustments
Tradotto tutto tranne il jap.
Merge pull request #934 from max2348/patch-38

Tradotto tutto tranne il jap.
aggiunte trad eng
Merge pull request #897 from Matta95/patch-71

aggiunte trad eng
Add an alias for texting applications.

I did not bother installing a dev environment for that, hence, it is not tested. I used [1] as my resource, not sure if this is adequate.

[1]: http://developer.android.com/reference/android/content/Intent.html#CATEGORY_APP_MESSAGING
Add separator above text filter
Merge branch 'patch-1' of https://github.com/padenot/Summon into padenot-patch-1
Member remove unused files
Member add widget-box in templates
update git to 1.8.0
Adding meta.maintainers
Upgrade libraw1394 to 2.1.0
- Updated android SDK to version 21
- Updated platform-tools, addons and system-images that belong to release 21 accordingly
- We must also patch 64-bit emulator instances now
Edit the README to test the Login branch
Merge branch 'master' of github.com:Noxalus/YAPOG into Login
Merged with master branch.
Added empty files and a database backup on the Login branch.
Added files for the database part and edit the CMakeLists files.
[parallel] display some debug messages to know the number of tasks which will be forked
[parsing] display the file where the error is on parsing error
Fix for /f permanent and /f peaceful commands giving an NPE if run from console
Fix for rare NPE when Spout territory info update is run and affected player disconnects at precisely that moment
Clarified "cannot attack neutral faction" messages to indicate enemy status is needed
Updated Bukkit lib to correspond with CB 1337
Removing some old code and try to read colors in the listeners.
Adding a couple of admin bypass commands.
Moving over to the use of describeTo.
Missed one
Spout overlay support is missing for the new relation coloring. Otherwise done.
Adding match mode for id search to MassiveCraftCore and improving the faction argument readers.
Claim command refactoring in progress.
Managed to get rid of some commands. This needs to be rethought even more though.
Indentation fixes and comment cleanup
Improving the faction tag matching
Added a permanent power command
Fixing a string format error and possibly solving a money rights issue
Possibly solved the faction creation issue. Changed the best id match to something more reasonable
Existing safe zones and war zones are now renamed to remove the extra " " if they have it, mainly for better /f claim compatibility but also to comply with the modified default names
Updated Spout features to improve consistency (of code, and of displayed information)
Fix for nonworking war zone and safe zone renaming
Further improved safe zone and war zone auto-rename process courtesy of Olof
Fix for unclaimall command not working if Economy was disabled
In the middle of refactoring to merged role and relation as one enum
reorganize and update a bit
More this in form editing.

Setting this in `dataInit`, `buildSelect` and `custom_element`.

Signed-off-by: Dr. Oleg Kiriljuk <oleg.kiriljuk@ok-soft-gmbh.com>
unification ok (swp file oublie)
weakly acyclic
weakly acyclic update
weakly acyclic works
clean debug
sticky, weakly-sticky
atomic hypothesis check
ah, disc, dr
little change on scc processing
disconnected check, grd analyser scc display update
update todo list
PIMS-940 remove and ignore eclipse files
good
Merge branch 'master' of git@github.com:PPilger/OOP-3.git
alle fehlermeldungen ausgebbar
Scale types 0.6 not 0.4
simplify squareParens
Builtin moved from VariableRef to Definition
Update _posts/2012-08-14-ardrone-high-flight.md
Add autoloader for existing class test
[172]  Added translator class. From here on out, migrating to an automatic ajax based language system
merge the warning fix from bioc devel
Change class token to "class"
Slight changes.
Merge branch '3.0.8' of github.com:Rebell/bdroid into 3.0.8

Conflicts:
	initramfs/init.wave.rc
Access tag caused problems on iOS, removed tag
disable loading movie when file not found
Rewrite Command. add Command section.
Added mail notification when people take responsebility and sorting of all listings.
Les cookies sont désormais dans le même répertoire (la racine).
BLUEGENE - Correct potential deadlock issue when hardware goes bad and
there are jobs running on that hardware.
Completely re-written from scratch.
Added example class for TestLocalVars.
Added JavaDoc.
Deleted outdated TestLocalVars files.
Removed outdated comments which were previously added for TestLocalVars.
Merge branch 'master' of https://github.com/Seitenbau/jca.git
Rewrote search logic and added comments
Modified to store proxy settings per thread.  Also defaulted to Chrome as the browser.
Commit overflow
started calvin and worked in generative econ bits
DMD needs vararg imported for varargs to work on 64 bit.
Deal with size_t being ulong on 64 bits
Sutvarkau, kad veiktų 'Figure' numeravimas
Exit loop when database is created.
Freeze more eggs.
Improve readability.
use erp5-component branch of erp5 repository for erp5-component branch of slapos repository.
version up : LibreOffice 3.5.2.
BUG: use the qSlicerApplication to set up the mouse mode tool bar, add icons so can test it properly

git-svn-id: http://svn.slicer.org/Slicer4/trunk@19945 3bd1e089-480b-0410-8dfb-8563597acbee
BUG: Failed to restore Volume Rendering method setting

The Volume Rendering method setting was registered before the QSettings
were set to the panel, this has the drawback to not restore the value
from the settings but keep the default value.

Closes #2265

git-svn-id: http://svn.slicer.org/Slicer4/trunk@20495 3bd1e089-480b-0410-8dfb-8563597acbee
Lots of end-game improvements

Games can actually be won
Tiles can be swapped
Side menu can be hidden
Finished games are normally hidden
[Version 2.5.6]
  - Implemented my own dYamlConfiguration class for loading
variables.yml, this is required as Bukkit's config class lacks Unicode
support
  - Use Bukkit's implementation of addColor, as it's faster than the
RegEx I was using
runtime in Stopwatch rule for Performace tests
added commandline option for an extra lua search path
fix for current cliargs version (as required by busted)
force paths to be absolute, otherwise it will take the path to the Lua VM executable.
Item list for tally list carry over is no longer hard-coded. The list
now contains all stockable items.
Add some macro in "ToyTchar.h".
Revised Esperanto translation

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6246 17fca916-40b9-46aa-a4ea-0a15b648b75c
Fix imports
Write IV2 viable replay sets to the fault log at appropriate times and
places
Hopefully resolve issues around avoiding writing fault logs before
completing command log replay
Duh, when you add a message type, you need to add it to the factory.
Need the full TXN ID, not just the sequence value (API use fail)
Need to become the leader before setting the max TXN seen to make
command log fault log writing happen correctly on promotion (ugh).
Pull some code in TableSaveFile into a helper function. Simplify a the test case for ENG-2660
Add a simple self checking tnxid app that can be used to determine whether transactions out of order or missing.
Make Iv2TestSpSchedulerDupe use valid mock txnids.

The new TxnEgo logic throws on invalid ids. The testcase has to
be a little more accurate with its sequence numbers now.

Also privatize the sphandle in TransactionInfoBase to help
narrow down its use.
Make TestMpPrmoteAlgo use valid txn ids.

This is insufficient to make the test pass with the stricter
sequence range checking. Need to handle the special case of
an empty repair log that reports Long.MAX_VALUE as the last seen
txnid.
ENG-2637: Thread safety in parameter set serialization.

Make ParameterSet and StoredProcedureInvocation serialization thread-safe.

ParameterSet will keep a copy encoded strings or string arrays on parameter
assignment. Once created, they won't be mutated. On serialization, use the
encoded copy so that it doesn't have to encode them again.
Handle VEM in enterprise Debian package
ENG-3713: Fix broken index iteration.
ENG-3713: Test code to exercise the now-fixed code path.
ENG-565. Remove primary keys from genqa ddl.
Fix run.sh to use correct parameter name.
ENG-565: Silently ignore indexes on export tables if they're in the EE.
There should be an error in java, but I'm not sure there is one yet.
Merge remote-tracking branch 'origin/release-2.8.2' into release-2.8.2
ENG-565: Make the error message more clear when export tables have indexes.
ENG-565: Fixing export test suite to not have pkeys.
ENG-565: Fixing another export test suite to not have pkeys.
Update docs removing add/drop index.
Merge remote-tracking branch 'origin/release-2.8.2'

Conflicts:
	doc/UsingVoltDB.pdf
Treat table name without case sensitive; Offer a more readable error for the insert procedure