labofsahil/github-event-dataset-2012 huggingface dataset:
Camouflage is now working without and extra function
work on inventory transitions
Merge branch 'master' of https://github.com/Alok-Sharma/Raxa-JSS
basic inventory transitions work
change openmrs server address
merge conflicts
3720
4557
Got Kinect processing Skeleton Frame working on Page 1.  Next step is to allow for selection of a setting on this page.
Release 105

Change-Id: Iff66ee40782c687676cba8eaf5a5c3d6737e4b83
Merge branch 'built'
Disable Nova parallel unit tests by default.
made the hidemenu function cleaner
edited the createItem function
got rid of some outdated code comments
finaly got working scroll bars in! few more tweeks before they are done
made offset sizing dynamic instead of static
variable names to help read code
分支测试。
Server分支测试。
Merge branch 'server'
Merge branch 'doc'
分支合并测试。
助手模式测试。
个人任务说明。
增加Client分支。
removed minc-tools
sql para inserir automaticamente o gerente quando o pacote for atualizado
Temporarily removed shader
Merge branch 'material2' of https://github.com/Blanel/agi_project_2 into material2
Finished details of basic layout

Included vote buttons, comment form, and tidied filler text
Added new data scheme for voting. Now check that the logged in user is the on creating a release
Fixed rating display on releases index
Added model for comments
Change to using threading.Lock instead of threading.Condition, and check lock state before trying to release it during the finally block
Merge pull request #199 from bunjiboys/master

Fixing double release of locks
xfce4-power-manager: apply patch fixing en_gb lang crash

See https://bugs.gentoo.org/show_bug.cgi?id=419973
xfce4-power-manager: fix patch since it still crashes
lol sorry about that Rob

Change-Id: If6e792e13aeda1361dd062464c7b9662dabe9237
Fixed issue with solutionValues and vector-valued bases.
Fixed issue with RieszRep in which it would not evaluate correctly on side BasisCaches.
finished nossos_resultados
images and ie8
Implemented nodes having their loaded domains and assemblies set upon having delivered an assembly to another node.
storing price
Merge pull request #132 from martinkotula/master

Single tab per filename
hej ba inget changed
Quick change for player status
Moved nav links in the nav bar to right.
Merge branch 'master' of github.com:CospanDesign/website
Fixed container display:none; width issue.

When this.container DOM element, or a parent element, has had
display:none; on it at any point, Swipe isn't able to use
getBoundingClientRect().width or offsetWidth to get this.container's
width.

This patch allows the dev to pass in options.parent containing a parent
DOM element known to have a static width applied or to be a percentage
width but never with display:none;
Cleaned vim colo's up a bit, changed other stuff
Edge - Minor edit
emacs: no need to use this backquote, a list is simpler here

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
Improve code by making explicit there is only one thread to look at

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
0.1.16
Updated getSortedRecipes algorithm to be depedency aware
0.1.17
updated readme after merging feature basic-login in develop
[1247]
Reviewed by: N/A

Initial Commit
README changes.
Merge branch 'master' into development
fixes.. implemented driving simulaton forwards
Added documentation for lua/stdmap.lua.
bash-completion port brewに対応
Add: Packet to Nearby
posts controller fix
create_post feature/steps
Imagen de estado
Removed a compiled file that shouldn't be there
Replaced references to Libraries.Core with Libraries.Extensions
fixed image gallery in all media queries.
Form helpers to ignore empty name attributes (fix #1506)
Core/Spells: Fix DynObject AoE effects for invisible targets e.g. Flare
Merge branch 'master' of https://github.com/Elron103/TrinityCore
ADD: read_trans(), write_trans()

IO for *-trans.fif files
DOC: add trans IO to python_reference.rst
Merge pull request #233 from christianmbrodbeck/cmb-trans

ADD: read_trans(), write_trans()
cleanup
rename test file for consistency
FIX: source_space IO

 - read_write tag 410
 - read/write FIFF.FIFFB_MNE_ENV block
 - write FIFF.FIFFB_MNE block
ADD: SourceSpaces class
FIX: SourceSpaces

 - __repr__
 - DOC
 - info dict
 - "subject_HIS_id" -> "subject_his_id"
FIX: read_source_spaces_from_tree()

return a SourceSpaces object
FIX: read_source_spaces_from_tree()

don't read the FIFF.FIFFB_MNE_ENV node here (because it does not
contains information relevant to the source spaces in all files)
ENH: Speeding up nosetests, adding raw.crop method
FIX: Fixing tests
ENH: Speeding up nosetests
ENH: Speeding up conn test
ENH: Speeding up, adding copy option
fix docstring
ENH (DRAFT): add dict features and support for conditions to Epochs

Related to #133 -- please don't merge. I wanted to expose one possible approach to this and would like to get some feedback before proceeding.
ENH: Dict features for Epochs.

- parameter event_id now takes either int or dict. Internalla a dict of event_label : event_id mappings will be created which are exposed to the user.
- On init the events passed are reduced to the events available in the event_id dict. The dict is then used to subset the available events
- for this purpose I added a private function ._get_events() that is about compliant with Python dictionary .get --- returns None, if not in event_ids, else it returns the events associated with the key.
- I found instead of passing keys to average / std_error, etc. It is less testing affordant and cleaner to extend .__get_item__. It now checks, whether the key is an int or str. if int, as before subsettig by epoch number, if str and in self.event_ids an Epochs subset associated with the key is returned.

To get what @agramfort initially wanted he now can say epochs['audio'].average()

A simple test case is:

```Python

run examples/plot_read_and_write_raw_data.py

import mne

events = mne.find_events(raw)

epochs = mne.Epochs(raw, events, dict(a=1, v=2, button=32), tmin=-0.2, tmax=0.5)

epochs['button']

epochs['b']

epochs['a'].average().plot()

```

Let me know what you think about this take befor I get into further details

D
ENH: improving docs, adding catches + tests
ENH: setting name to Evoked on subsetting Epochs via label + topo Example

@agramfort : if you're fine with this let's merge it soon and get back to the fancy stats / 2-sample t-tests / on the next iteration. I think for 0.5 this is already nice whereas other parts of mne need to be polished for 0.5.
update waiting
Readme fix
Merge branch 'hotfix/0.0.5'
get plugin pid from mosix

todo: attach pid to feed in db
job properly queued and pid returned to chris
pid attached to feed

todo: cleanup code
wip/todo: fix feeds overflow properly
Building framework for future code
Continuing to build scaffold of necessary function for all games. Added scaffold for taskswitch game

Scaffold for taskswitch game not yet complete
Working on how to genereate game_enviroment in a more general way.

Not looking good. Looking as thought i will have to implement it manually for each game.
Hopefully ill figure something out
fooling around. Nothing substantial
generalizing, working things out, nothing concrete yet
trying another framework based off new found tutorial
coming together
still building
still building
added more files in development
coming together now
Sprite.js is tested and works. Logic next to be tested
Logic has been tested and now works
Rewrote cueList generator function in new object-oriented paradigm
COme together now
'Working version of Taskswitch'
added class for Api details
Fix: webpageDigest
add site artifacts to ignored files
Added death bans and a server-wide 1 second clock to update things with
playing with ranges and loops
Update README.md

Updated bullets
a bit more work on the interthread communications
Functional system for simple used. 

Allow synchronisation and update function for Cron task.
Full of things missing...
V 0.6
Merge branch 'olivier' of github.com:Gluckens/Casinotopia into danny
Heritage de commandes
Merge branch 'olivier' of github.com:Gluckens/Casinotopia into danny
Structuration du MVC et les interactions avec les commandes (a valider)
grosse modification de la structure
ajout de controleur et model
le client se connecte losrqu'on fait connecter
Merge branch 'danny' of github.com:Gluckens/Casinotopia into olivier

Conflicts:
	ca/uqam/casinotopia/client/MainClient.java
	ca/uqam/casinotopia/commande/Commande.java
	ca/uqam/casinotopia/commande/MiserRoulette.java
	ca/uqam/casinotopia/controleur/Controleur.java
	ca/uqam/casinotopia/controleur/ControleurClient.java
	ca/uqam/casinotopia/controleur/ControleurServeur.java
	ca/uqam/casinotopia/serveur/ServerThread.java
modif apres le merge
modif apres le merge code non compilable
MVC
Merge branch 'olivier' of github.com:Gluckens/Casinotopia into olivier
Merge branch 'danny' of github.com:Gluckens/Casinotopia into olivier

Conflicts:
	ca/uqam/casinotopia/model/ModelServeurClient.java
	ca/uqam/casinotopia/model/ServeurClientModel.java
	ca/uqam/casinotopia/modele/ServeurClientModel.java
	ca/uqam/casinotopia/serveur/ServerThread.java
correction d'erreur apres merge
ajout d'un chat
Avant clean commentaire
Avant clean/delete bad file
Clean faite, package Model laisse pour pas fucker merge
Ajout du package model pour pouvoir puller
MVC + Observer + MiserRoulette + UpdateApresMiseRoulette
Apres merge Olivier ControleurPrincipal
Apres merge manuel des threads
Kabutops finished
dev-util/jenkins-bin-1.490
Fix SQL problems and add drop statements
Added breadcrumb support.
Merge pull request #2 from EricWittmann/srampui-8-breadcrumb

Added breadcrumb support.
修正變數名稱錯字
e4x iroiro
Saving and loading worlds now works
Base implementation of the GameObj class.
file lines
Add storage variable to ToC.
2.0
+constructor
Updated app version info
updated app version info
README Fix

Oops
modified dbObject.php
Initial commit of trackoer-page-url.js Javascript
Adding application/assets and assets/public RewriteRule(s) to .htaccess
Clarifying public domain (un)license for James Padoley's parseurl-dom.js..

* License: http://james.padolsey.com/terms-conditions/
* License: http://unlicense.org/#the-unlicense
Big rework of test-ga-js-learning1 page/ view - to use updated Javascript
Added support for StatementBlock, IfStatement and ForeachStatement.
Added proper indenting for function interfaces.
allow "photo" type
command line add --version option
add fm_edit function
Dialog add --window-close; add [REVERSE] to close
Dialog progress show percent by default
socket add property screen_size
Dialog add stock button help
FIXME need exo font update cur tab gtk2 #206
fix status bar text color not set on new tab
root for signed in user -> resque. fixed it!
Updated readme
e
Updated readme

Conflicts:
	README.md
Added plugin version to plugin GUI
Yay initial commit :D
Replace flexjson with org.json
Change Searchbar reset button
Rewrite the Settings class to be more stable
Merge branch 'settings'
corrections
Merge branch 'master' of https://github.com/IssaBarbier/Frontend

Conflicts:
	projetp1/src/com/github/projetp1/MainView.java

Signed-off-by: Issa Barbier <issa.barbier@gmail.com>
fixed incorrect answers method
print game id in insertGame()
Got started on loading 3ds files.
synchronize return deleted files
Fixed to not require 3.1.x
removing unrequired comments
Handle missing data files
Solucionado el problema de la carga y escritura de los valores de las escenas. Funciona correctamente.
Problemas con la escritura
Escritura y lectura de grupos y escenas solucionado. El problema era de la programación de la tarjeta.

Trabajando en la organizacion de la ip y el cambio de ip
Trabajando en la organizacion de la ip y el cambio de ip.
Minor and cosmetic updates to the curriculum vitae directories.
added algm
span_out correction
Added selection for a item in the data. This item will be marked as a red dot in the graph
fixed some bugs in drawing the character in the editor
Restarting everything
Threw away all the old code and started over, focusing on the core functionality instead of the site and the forms.
styled comment area input boxes, per #77
list items for collection tree, fixes #71
add interest button:
started implementing additional methods for the node_http_response object
[Baralho_Cartas] Melhorias no código
added andys notes
Merge pull request #188 from Andrewglass1/master

adding andys notes
Add rounded corners for the page number display

The page number is display in bottom left part of the slide and the node has now rounded corners, like the progress bar.
Reduce space in UML boxes

The space between text elements in UML elements has been reduced.
Add documentation about languages in 'my'

Three options 'english', 'french' and 'francais' has been added as options for the 'my' package and now are documented.
Add a counter in the appendix of 'mybeamer'

The page for the appendix of a 'mybeamer' class document are now counted in an independent counter. The total number of pages does not take into account the pages of appendix; the pages of appendix are numerotated starting from 1.
prereqsetup exe
Mark failing tailoring tests as pending.
Add assertions to tailoring spec.
Add comments for pending tailoring tests.
Working on the SQL Database
leiame
Merge branch 'master' of github.com:Kazuo256/mac0420-ep2
LEIAME
Passenger really go twice now
Bleh
Melhorei a impressão de pacotes na rede
Session handler [Redis]
added a preferences file for storing certain information that may be changeable later on.
modif css
Merge branch 'master' of github.com:KevinLaRosa/gameover
adaptation du helper filAriane et getCurrentQuestion par rapport au changement de rootage / url
Added s2 nexus for deployment
Fixed a bug that led to AttributeError on the module import in Python 2.6
Version 0.2.2
Move JSC_PATH to a BaseLinter method so all linters can access it and future-proof it against changes
Moved JavaScript engine detection to BaseLinter
优化时间标尺组件的绘制
Debugger: Improved support for inspecting built-in object types.
Changed Debugger.cpp optimization to favour small code; saves 8KB.
Upgraded PCRE to 8.30.
Optimized PCRE code size by forcing UTF dis/enabled at compile time.
Enabled JIT compilation in PCRE.
Suppressed x64 warnings in pcre-jit.
Added support for (*MARK:NAME) via RegExMatchObject.
Improved handling of AHK_ATTACH_DEBUGGER message.

It must now be sent or posted to the script's main window (not a GUI),
  and should work even if a message loop other than the one in
  MsgSleep() is running. (For instance, while waiting for MsgBox.)
Revert "Enabled JIT compilation in PCRE."

This reverts commit c52b2c31c639b7624ad02a74d96ca862fb13edc1.
Suppress x64 warnings.
Merge branch 'dbg'
Merge branch 'pcre16'
Changed default script codepage to ANSI.
Fixed thread silently exiting when Func.() has too few parameters.
Make it possible to test AIDL methods
Merge branch 'master' of github.com:pivotal/robolectric
Implement readStringList and writeStringList
Merge remote-tracking branch 'upstream/master'
Removed behaviour that is now handled by other script

Removed the function that auto-scaled the texture in the fader script
because, now, there's another script to do that with any texture.
Attached the auto scale behaviour to the fade object
generic
fixed conflicts
Started work on this project.

Mostly worked on the intro window. Buttons need more work. Eventually
they will be replaced with images. Also need to add more modularity,
specificly with a class for the background image.
Merge pull request #1 from MCManCub/temp

Started work on this project.
main css change
تغییرات جدید
#8 icon at bottom right corner with settings to enable it, and some connected code refinements in JavaScript
Bug 8628 - Start to implement auto page turn when user is idle

Intervals are currently short and hardcoded, next step is to make them
configurable.
Removing deprecated functions
Improved the include headers
Use collection type variable
Scrape row values
DB, Basic Form and JSON now works
COMMON, All: Bidirectional reverse iterator for List.

Common::List.reverse_begin() did not work like in the STL, but did
return an bidirectional forward iterator pointing at the end of the
list,instead of an bidirectional reverse iterator pointing at the end of
the list.

Common::List.legacy_reverse_begin()  works like the old reverse_begin()
did, for compitability, but is deprecated.

All code that previously used reverse_begin() uses
legacy_reverse_begin(), but works like before.

New code should not use legacy_reverse_begin().

Changes are for constant iterators as well as for iterators.

Common::List.reverse_begin() returns a bidirectional reverse iterator,
also constant bidirectional reverse iterator.

List.reverse_end() is functionally identical and interchangeable to
List.end().

List::Iterator, List::ConstIterator: reference to underlying List is
private. Small refactoring for oo code quality only.

Expands Testcases to cover all methods of List including the use of
reverse iterators as parameters.

Expands comments.

Fixes http://wiki.scummvm.org/index.php/TODO#Iterator_handling .
Reworks patch previously submitted at
https://sourceforge.net/tracker/index.php?func=detail&aid=3515308&group_id=37116&atid=418822
and https://github.com/scummvm/scummvm/pull/230 .
add debug tools

Change-Id: I96d3d68ad6932824a7a6e02bdda1403c9f1afa83
Signed-off-by: wangwei_b <wangwei_b@xiaomi.com>
add smartaction related app SmartActionFW.apk

Change-Id: I586dbdca9f177120f29481bb45d8986aa0539f37
Signed-off-by: wangwei_b <wangwei_b@xiaomi.com>
Change Iba3c5cbd: Show GPS observer name

Change-Id: I26209651426feb60b95d1e4c85e9ff68cc4a3084
Change I9272464f: add encrypt app

Change-Id: I32ea3cc98ba9234ab8c3b2a6d8047edbd38d86dc
adapt hdpi menu width

Change-Id: I3e01d6953d282bc2d4fd9c1d492e9875b9380fd4
Signed-off-by: wangwei_b <wangwei_b@xiaomi.com>
Merge "adapt hdpi menu width" into ics
Sync with gnulib 0a6dafee2bb8f69a931345a1f67d835ee5062967

Avoid needless check on GNU/Linux.

* m4.include/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Omit STAT_STATFS3_OSF1 check
on GNU/Linux systems, since it can't possibly work.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Sync with gnulib 2ab2617ee340ff35a9a4c713004fb302868d41b0

* src/filemanager/mountlist.c [STAT_STATVFS && (__linux__ && (__GLIBC__||__UCLIBC__))]:
Undefine STAT_STATFS2_FRSIZE to exclude code not used in this case.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Ticket #2538: mcviewer: unused result of str_term_width1().

And reduce size of buffer used to show file size.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Fix typos.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Fix of f13 key handling.

ViewFile doesn't have the default key, and f13 is key for ViewRaw
which is handled in panel not.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Fix of 'External panelize' dialog: update of 'Command' field content after mouse click.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Remove unused assignment to current_dir.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Tweak of select codepage code in case of --disable-charset

...in mceditor, mcviewer and mcdiffviewer.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Ticket #2839: Fix keybindings for Quit command of mcedit.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
(exec_extension): ret rid of double filename conversion.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Code cleanup: removed unused variables, removed unnedeed code and so on

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Avoid compiler warning about unused variables in case of --without-subshell.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Code indentation.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Ticket #2820: Typo fix 'oofice' -> ooffice

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Fixed the filename escaping issues.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Added 'View' action to all video formats.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Fixed libexec hardcoded value

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Merge branch '2820_extd_fix'

* 2820_extd_fix:
  Fixed libexec hardcoded value
  Added 'View' action to all video formats.
  Fixed the filename escaping issues.
  Ticket #2820: Typo fix 'oofice' -> ooffice
Test for buggy

Signed-off-by: Ollie <dzineit@live.co.uk>
More notification stuff
Adding emotion

Sean McCann left the text document in a very sorry state. Poor file.
Added loading
Added more description of methods
- Added more descriptions of methods
- Changed Player to OfflinePlayer in ChunkPlus and ChuPlu
Fixed URL on Logo
Added a ghost.  However the ghost represents the client
[TASK] Added @route NoMatch('bypass') on SubscriptionController

This prevents the Controller name argument from being included in the
URL when used with FED's automatic controller argument routing feature.
将重复的样式转移到application.scss中
将card_controller更名为home_controller并修改其相关逻辑
first 6 problems
Ctverec
Kresleni
Fix delete restriction
Show commit revision in footer
Force output of compound initialisers in user kernels

For C++ code generation, compound initialisers of the form

  float x[3] = {1f, 1f, 1f};

in the user's kernel would previously have their rvalue stripped,
resulting in

  float x[3] = ;

Force output of the rvalue by setting
locatedNode->setCompilerGenerated ().
another precompile tweak.
Add proxy and timeout methods to API
xbmc-rpi: update to xbmc-rpi-2acdae7

Signed-off-by: Stephan Raue <stephan@x201.openelec.tv>
projects/*/linux: readd back some more defaults, build for size

Signed-off-by: Stephan Raue <stephan@x201.openelec.tv>
systemd: update to systemd-187

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
boblight: use TERM signal to stop boblightd
  this closes #453
fixed bug with empty collections
just info about empty rel_urls, no warning
Make gem for rails-2.3 branch
click 'RDI Detecotr'
Changed LOAD_STATIC_EFI_DATA_FROM_EXTRA to the default setting
Fixed some stuff
Merge pull request #1 from christ66/master

My changes
Creatind readme.md file
Adds an irresponsibly short README.md
Added documentation tabs, removed faq tab
Made documentation wider
Threading with clean ups completed, download works
added textures for generator
SetGameTime, GetGameTime
Feral Agression
Testing variable assignments from the CI Controllers
0918 @office
Plants now die. Need to optimize a lot. Probably switch to lists instead of vectors
Adding some more control for the noise
added travis configuration

closes #1
readme
readme formatting change
SCEDC catalogs SCSN and SCEC formats 201210041600
OpenCV automatic downloader

OpenCV automatic downloader was added by using OpenCV.cmake.

Signed-off-by: ayamada <ayamada@bwh.harvard.edu>
Release 1.7.3
Fixes 14828.
Fixes #14828.  Update editor._updateTimer references in LinkDialog plugin to reference remove() method instead.  Optimized a couple of invocations to defer(...) in RichText. !strict
Rollback 14828
Update Tooltip.js - fix bug introduced recently when a local variable definition was removed.
Merge remote-tracking branch 'slx/SLX8.0' into SLX8.0

Conflicts:
	form/_FormWidgetMixin.js
Help messages fixes
Add PledgeLinks summary
Fix parameterized path management.
Repair the parameterized path.
Added getPermissionsHandler Method
Implemented new MasterPromote-Api
Version number updated
modified payment cancellation to allow for error processing on subscriptions that no longer exist for whatever reason.  implemented skip callbacks to allow for cancellation without re-creation
Merge branch 'develop' of github.com:SouthArts1/ArtsReady into develop
Merge remote-tracking branch 'origin/develop'
wat git
Make the configuration populate correctly
Migrate from 1.1 to 1.2 configuration
Make the PingListener port configurable
Merge pull request #17 from tips48/configuration

Make the PingListener port configurable
force apt-get update after updating repo
wait 30 seconds to latch in the success for the DOM, then clear
Restricting REALM placement.
Enemies + Laboon + Background + KeyBindings + Lots of refactoring
run files, readme
th is default to center, it should be the default here.
bla bla
Merge branch 'master' of github.com:Systemic33/Intracker
Added TradeService to UnitOfWork
existance query optimization
- SPSTF, Implemented lazy prop
- Infinite loop bug with access-binary-trees
- Added 3d-raytrace sunspider benchmark
Correcting sha1 return value
Basic implementation for logging

ShitLib:
- Add Universal class (used for timing, etc.)
- ClipboardHandle-Class:
* Changed Methods to non-static
* Add LoggingRoutine
* Add possibility to stop logging via other thread (volatile boolean)

Testsuite:
- Fixed clipboard calls (not static anymore)
- Add Logging Test (cannot be stopped yet)
Basic implementation for logging (#2)

1c742436324c9d557c7b367b35d1514adf285e63 for details
Changed struct to enumeration

- Easier state selection
Add SetRoutine

ClipboardHandle:
- Rename setClipboardContent to setClipboardText
- Add setRoutine
Add requestStop Method
Merge pull request #3 from Th3Gr4vy/Clipboard

ClipboardHandle Class update
Ported from ZXing: "prefer high res frame grabs on retina ipads"
Ported from ZXing: "remove cap session i/o before release; causes core
dumps on 3G"
Ported from ZXing: "Issue 1288 PDF417 barcode flipped"
Ported from ZXing: "Issue 1288 another fix to flip PDF417 over"
Ported from ZXing: "new project files for cpp and objc, new sample apps
for objc"
Ported from ZXing: "Add ability to rotate LuminanceSource 45 degrees,
for later use"
Ported from ZXing: "iOS 6 beta xcode tweaks and minor fixes detected by
new clang"
Don't use projection abstraction in GL.

Makes no sense anymore as it's calculated with gfx/math/ ...
Keep abstraction for XBox.
(Xbox 1) Add _XBOX define rule for custom stdint.h
(Rzlib) Add WIN32 include
(RMenu PS3) Build fix
(GL) Fix build for HAVE_OPENGLES target
(Android) Input - add device ID per joypad
fixed show family help error
Add better ls alias, commenting
fix test subqueries
add translation for gnparts
add robots meta tags
InteruptedException

Maybe an InteruptedException is not such a bad thing when you
Interrupting the Thread intentionally and you know you need to catch
it...
Problem is, the interrupted thread is not the one that is waiting to be
started from the ExecutorService, but the auction that its thread has
been started and there is no problem releasing the latch.
The service is working fine!
Right now it's not damaging anything but need to be taken care of.
Further tasks:
- The main idea here is to save the current situation of the system,
meaning the offers been done to a certain sale need to be saved to the
xml as well. In my opinion it's too much and saving the winning offer is
enough. all this information is saved to the log file anyway. So been
done that, we need to load all this information back to the system at
the next run.
Added a little bit of margin so the page doesn't disappear under the main menu
Spacing of footer on another element
Updated the seeds
When a scenario is not flagged as best, editing the run metadata on the front end now includes a checkbox whether or not to mark this scenario as best.  This flag gets passed tpo the back-end as a true/false parameter named 'markAsBest'.

The metadata bean has been updated to include this field 
Marking run as best works in update and new runs have empty otherDetails section
Noticed typo

- Modle -> Model
Fixed issue with error message coming up on subsequent edits of any run between reloads of the applicatio9
Issue #WATERSMART-9 - Odd error message after editing run
Added a few new base maps including:  http://www.arcgis.com/home/webmap/viewer.html?webmap=c09e5dcdcc1c45289396a3a7d82eb782

This shaded relief base map is the cleanest I've seen for the data we display
Fixed an issue where front end is submitting a checkbox as "on/off" instead of "true/false"
Added startup context listener in order to create symlinks for our file repository from WPS
Added startup context listener in order to create symlinks for our file repository from WPS (take 2)
Wasn't checking isBest(), bad Jordan
Merge branch 'master' of git://github.com/isuftin/WaterSMART.git
created parent project

- moved old stuff to UI module
added in wps module
added a parse module (move parsing to WPS soon) and common module

- moved dependencies around and such
added do everything process, need to fill in actual work
Added notification after upload has completed
Too much stuff to keep track of

- cleaned up wps module
- made interface that acts like WPS in a way
- completed workflow
- now I just need to test
Going out for a bit, will finish debugging later
Stuff is working it's way through

- commented out the process checker (need something that doesn't fail so awefully)
- minor path fix
- actually got processing complete email
- having problems with JNA loading library too many times (watch out for this)
Merge pull request #17 from jiwalker-usgs/master

Here is where we are
Output page rewrite based on patch by demi_alucard.
Use a more modern layout and highlight the capabilities of each renderers.
Fix ASS rotation of the \frx tag.

The math was flipped in the VSMod SSE2 code which was enabled in r5569 (rev 4164294)
Document the SSE2 rotation code so its easier to match it to the C code
replace USHORT with unsigned short
Subtitles: fix a few cppcheck issues

* Unitialized variable
* possibly array out of index
* reduce variable scope
remove unused variable
update MSVC 2012 version check and Todo.txt
indentation cosmetics
fix a few NULL pointer dereferences
Fix a few C4267 warnings.
Fix Playercontext
worked 2
jQuery updated
Reverse commit from JqueryUI update, and update jquery 1.8.3
Merge branch '2985_arch_2965_update_jQuery'

Conflicts:
	rudder-web/src/main/webapp/templates-hidden/common-layout.html
Merge branch 'master' of github.com:Normation/rudder
fixes #2930 Improve group display
Fixes #2973 : Add automatic reports cleaning backend
Merge pull request #9 from VinceMacBuche/2997_Implem_2973_automatic_clean_reports_properties

Ref #2997 : Implementation part : Add an automatic report cleaner based on properties
Fixes #2997 : correct the case of new parameters
Fixes #2997: correct the attributes in the scala code for automatic reporting to match the one documented
Merge pull request #49 from aesraethr/bug_2930/dev/improve_group_display

Fixes #2930 : Bug 2930/dev/improve group display
Fixes #3114 : fixes classes on DataTables since update to DataTable 1.9
Merge pull request #52 from VinceMacBuche/bug_3114/fix_dataTables_classes

Fixes #3114 : fixes classes on DataTables since update to DataTable 1.9
Ref #3018 : Add non compliant report logger.
Merge pull request #34 from VinceMacBuche/ust_2988/dev_3018/add_failure_reports_logfile

Ref #3018 : Add non compliant report logger.
Added automatic version detection to setup.py
Use bitshift for computing powers of 2
net: lazy listen on handler

This allow the server to be shared without the need to handle connection
from master
cluster: do not use internal server API
net: support Server.listen(Pipe)
test-message: fix message output

1. The net changes add a stack frame to stdin errors.
2. The error line numbers were overly strict in many places.
errnoException must be done immediately
util: mark util.pump() as deprecated
Makefile: DRY js lint
fs: remove undocumented .destroy callbacks

The destroy() method of fs.ReadStream and fs.WriteStream takes a callback.
It's a leftover from the node 0.1 days, undocumented and not part of the
streams API. Remove it.
doc: util.pump is deprecated. Use Stream.pipe

Conflicts:

	doc/api/util.markdown
fs: fix naming of truncate/ftruncate functions

For backwards compatibility, fs.truncate(<number>) will proxy to
fs.ftruncate.

Fix #3805
net: add support for IPv6 addresses ending in ::

Modified net.isIP Ipv6 regex to allow for addresses ending in "::".
Added tests for new IPv6 matching reqex.
net: fix listen() regression, revert patches

This commit reverts the following commits (in reverse chronological order):

  74d076c errnoException must be done immediately
  ddb02b9 net: support Server.listen(Pipe)
  085a098 cluster: do not use internal server API
  d138875 net: lazy listen on handler

Commit d138875 introduced a backwards incompatible change that broke the
simple/test-net-socket-timeout and simple/test-net-lazy-listen tests - it
defers listening on the target port until the `net.Server` instance has at
least one 'connection' event listener.

The other patches had to be reverted in order to revert d138875.

Fixes #3832.
Add c-ares dependency

This is the c-ares code that used to live in the libuv source tree.
It is based on c-ares 1.9.0.
node.cc: include ares.h
dns: don't rely on libuv for c-ares integration
uv: upgrade to 3a8bb3b
dns: use uv_inet_ntop/uv_inet_pton instead of c-ares equivalents
uv: upgrade to 41b1265
Merge remote-tracking branch 'upstream/master'
installer: remove c-ares header files

Fixes #3847.
Started working on Enemies
It's /rocky not /spout !

Signed-off-by: ThatBox <thatbox@ymail.com>
Merge pull request #3 from ThatBox/master

Changed /spout to /rocky.
fixed WikiTemplateEngineListener
Species.tbl:
added description for LR HK destroyers
thoughts on mission reports and use of the fiction viewer
and git
Update xCCK, widget and Add leprogress
Update version of xCCK to 0.87
Update xCCK(0.90) and widget(0.32)
Merge branch 'master' of https://github.com/XoopsX/xupdate_store
Estadistica

Signed-off-by: Victor Gonzalez <victor.gonzalezr@usm.cl>
one-liner prevention of NIL error in renewals code
fixed display of code blocks, some copy editing
visual tweaks for blackouts part 2
modified footer, changed alert display
Added Sinatra to the Gemfile.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
erbファイル追加 & bugfix
Support for latest bukkit
SharedPreferences.Editor.apply on >= GB and .commit < GB
add some short cuts on top nav bar
#198: fixed tests, added json-rpc
re #198 renamed json rpc skin
re #198: added jquery.wdcalendar
re #198: added jsapi with listCalendar class
re #198: replaced jsonrpc to jsapi
re #198: added calendar workspace and calendar event creation to tests
#198: fix calendar.pt
re #198: cleaning calendar.pt
re #198: fixed dates on listCalendar
#198: fixed tests
re #198: added missing fields, added and registered necessary views for calendarAPI
re #198: removeCalendar to remove events from Calendar
re #198: fixed listCalendar, added updateCalendar and removeCalendar
#198: deleted jsonrpc
re #198: added popup edit event form, fixed listCalendar and detailedCalendar, added addCalendar, updateDetailedCalendar, addDetailedCalendar
#198: fixed edit.pt
#198: fixed calendar.pt
re #198: added Permissions
#198: fix Permissions
#198: added missing fields to popup edit event form
masodik teszt
GUI changes
Support for login on the bar added. FB & Youtube placeholder
fixed logic for list rendering conditions
Merge remote-tracking branch 'origin/master'
fixed stations list rendering in use case where user location isn't changing and there are no nearby stations in our own db
show station name on own row in stations list
added possibility to do some simply debugging from logs on mobile device
added possibility to remove mobile debug view completely by swiping right
fixed stations list initialization on use case where there are no nearby stations in our own db and user isn't moving
fixed map page center shifting on mobile device
added style for error-like messages in mobile debug
update standup scripts to recent revision.
Fixes some compilation errors and code smells.
Proof of concept stepping stone.

- Adds public uris to the GrammarDatabase.
- GrammarDatabase queries now generate query maps to add _id
- Fixed ugly spacing in GrammarDatabase.
- Deletes placeholder DummyContent thing.
- Adds Loader implementation to GrammarListFragment.
- Adds proof of concept code to GrammarListActivity to ensure db is
  working.
Cleans up the proof of concept code.

- Adds a delete all books method to the database.
- Stops creating so many dialogs and inputs.
Reached an impasse with app navigation.

- Added logic to re-use the same loaders and fragment for 4 tables.
Refactors the entire layout, adds working lists.

- Renames most of the layout oriented stuff.
- Implements a state-driven set of fragments for the main pane.
- Adds a lot of state handling helpers for our new fragments.
- Fixes some bugs and adds helpers in Database.
Fix nested form
Fix user registration view
updates to org stuff
merge
Merge branch 'master' of github.com:abedra/shell-shocked
Update readme with latest changes in 0.2.1 snapshot
Merge branch 'master' of github.com:aboekhoff/congomongo
added recommendations in man page
+ yield example
update .gitignore
Merge branch 'master' of github.com:achille-roussel/json
Moved abstract to a seperate file.
Add support for ProxyCacheManager to be set in the properties
Merge pull request #50 from mguymon/proxy_cache

Add support for ProxyCacheManager to be set in the properties
remove CloseLiveBrowser
[Component][HttpKernel] fixed testGetRootDir() on Win
[Security] fixed in_memory provider example
[Security] Fix typo in docblock
slovenian validators translations updated
merged branch adrienbrault/patch-1 (PR #4780)

Commits
-------

0a4fd43 [Security] Fix typo in docblock

Discussion
----------

[Security] Fix typo in docblock

Bug fix: no
Feature addition: no
Backwards compatibility break: yes
Symfony2 tests pass:
Fixes the following tickets:
Todo:
License of the code: MIT
Documentation PR:
merged branch peterkokot/translations (PR #4784)

Commits
-------

df66d90 slovenian validators translations updated

Discussion
----------

Slovenian validators translations updated

Updated Slovenian validators translations for master branch.
merged branch arnaud-lb/memory-example-fix (PR #4769)

Commits
-------

8997853 [Security] fixed in_memory provider example

Discussion
----------

[Security] fixed in_memory provider example

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes

This fixes the in_memory provider configuration example shown by config:dump-reference

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

by stof at 2012-07-06T11:07:50Z

:+1:
[HttpKernel] Fix #4719. Added condition which verify existence of profiler dump file. If file does not exists script inserts record to csv file.
merged branch yanoosh/ticket_4719 (PR #4779)

Commits
-------

74aa502 [HttpKernel] Fix #4719. Added condition which verify existence of profiler dump file. If file does not exists script inserts record to csv file.

Discussion
----------

[HttpKernel] Ticket #4719. Each call of FileProfilerStorage->write method adds row to index file.

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT

Each call of FileProfilerStorage->write method adds row to index file even if profiler dump is only updated. Event dispatcher in kernel call several times write method to save fresh profiler info. I add condition which checks if profiler file already exist then ignore add row to index file.

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

by fabpot at 2012-07-08T08:04:33Z

Can you squash your commits before I merge? Thanks.

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

by yanoosh at 2012-07-08T10:08:48Z

Ready to merge.
merged branch gajdaw/kernel_test_fix (PR #4766)

Commits
-------

6de6806 [Component][HttpKernel] fixed testGetRootDir() on Win

Discussion
----------

[Component][HttpKernel] fixed testGetRootDir() on Win

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: [![Build Status](https://secure.travis-ci.org/gajdaw/symfony.png?branch=kernel_test_fix)](http://travis-ci.org/gajdaw/symfony)
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: -

Method `getRootDir()` returns path containing slashes. On Windows machine `__DIR__` and `DIRECTORY_SEPARATOR` are backslashes. To pass the test on win machine we have to translate `\` into `/`.
better arc-output
introduce cutter_radius
ma-pocket hacks
documenting analyses
Restored to previous state to track down actions that are triggered but not enabled. Enbility will be enforced in future version
Update of mobile files
update of mobile pages by adding splash screen and sign in page
set up scoreboard.  waiting on logan to get info to me
remove reference of record frame in header panel
add all on/off button
Added ss_add_screen.png to screenshots.
Starting work on a profile page.
Added basis for summary list.
Moved profile button to menu.
Basic profile page with dummy data
Basic layout for simple activity list done.
Selecting an activity from the lists on the profile page now brings up the activity details.
Hooked up API to get activities a user has added.
Hooked up API for getting all activities liked or disliked by a user.
No longer need to fetch likes for each individual activity.
Decided we are grownups and can use public fields in domain objects.
Fixed minor error in last commit.
Don't pass activities array in activity overview page. Load profile page from activity viewer.
Delete parcelable RecommendationOverviewList.java.
Fixed likes highlighting. Changed gradients and list style for scoring and activity overview listings.
Hooked up scores API.
Added user stats API and applied it in profiles activity.
Minor fix.
Added feedback when user presses on list items.
Made register button on login dialog easier to press. Issue #16.
Renamed GraphDatabaseSPI to GraphDatabaseAPI to reflect its usage better
Made methods deprecated instead of the interface. We should add proper API methods here
Renamed GraphDatabaseSPI to GraphDatabaseAPI to reflect its usage better
Made methods deprecated instead of the interface. We should add proper API methods here
If a use of GraphDatabaseFactory didn't set config, then skip builder
Uses FileSystemAbstraction to check if file exists
Made it possible to start StoreAccess without performing recovery.
Added @Title for short descriptions of settings
Added Asciidoc generator
Updated neo4j.properties generator
Added lock free atomic array cache that avoids triggering full GCs.
Added GC monitor that will keep track on how much the JVM blocks application threads.
Merge pull request #341 from nawroth/docfixes2

Documentation fixes
making things compile
Configuration is now changeable through e.g. JMX
Merge remote-tracking branch 'origin/master'
Added logic that stops ExecutionPlanImpl running forever
ShortestPathBuilder now only solves one shortest path per invocation
Checks the type of the exception thrown
Cleaned up code around creationg of ExtractPipe
Added the simple matcher
Added the simple matcher
mutable map as context, cached-expressions
rewrote PatternMatcher.History, added toStream to getRelationships
Fixed test issues
First step in coming back to lazy evaluation
Use termsyn font in urxvt and gvim, fade non-focused terminals
Moving it to channel2 namespace
small unicode fixes
Added background and major styling changes
hdparm: update to 9.43
git: update to 1.8.0.1
python2-virtualenv: update to 1.8.4
xorg-server: update to 1.13.0.901
xlockmore: update to 5.41
linux: update to 3.7.rc7
modified /test/table.py && added .ui file..   previus fail
Upgrade jQuery to 1.8.0
ECMAScript 5 features for IE < 9
updated readme to markdown, and updated cmake
New collection map signature and decorator
Changing AbstractError to standard NotImplementedError
Better version management
Git-export script
Version updated to 0.3.5
Fix for release variable reset
Release notes for 0.3.5
Merge branch 'release/0.3.5' into develop
modified parameter implementation
Update Invader.rb

Changed png to gif
ALLJOYN-1420 WinJS - Chat sample crashes when trying to send an empty string.
ALLJOYN-1417: Fixed various memory leaks (mostly in ICE)

Change-Id: I747328932c9a001d2b73aec07ae7cae187a35c85
Fix broken build

Change-Id: I5835d31ccec09f4bd2c489391f375f989f920a3c
Synchronize ns to that in master branch to fix name service version issue
Update to use new NSProtocol SetVerion/GetVersion API
ALLJOYN-1423: Fix backward compatibility issue in name service

Change-Id: Ie46aabdc4808063abcaef18d9d347cbf9dcb2690
ALLJOYN-1423:  Discovered stray SetUdpFlag to false

Change-Id: I110c76abfb9aac4bff87caa2392599b8ffa42576
Prep. Release 3.0.1
ReleaseNotes for 3.0.1
ALLJOYN 596  MethodTable should return thread-safe method handler
ALLJOYN-1272: Added a reference count to protect the daemon router from unregistering the local endpoint (and nulling the pointer) when it might still be in use in DaemonRouter::PushMessage
fixed whitespace
Null out the old callback before deleting it to avoid possibility of duplicate free.
Join deletes the nameservice so the explicit delete in the destructor is redundant.
Unregister the null endpoint with the client router first because unregistering with the daemon router causes name ownership signals to be sent that will get routed to the client while the endpoint is going down.
include memory for auto_ptr

Change-Id: If260d0dc8af2ce813e413ea3ece18fff90a8f620
Add comments regarding how bundled daemon works

Change-Id: I279ea8e6bb928404a105bab58bfd8ef448ad684b
clean up comment

Change-Id: I6647d508a264248555ca04bb84c8592c0bb293bf
ALLJOYN 1276  check for null pointers
Add SocketStreamEvent class
MBUS-1237: Change the max MTU size of PacketEngine to 1328 for ICE data to account for the STUN headers in data packets through the relay candidate

Change-Id: I6859b9e8fef9fa5433aa10db59c12b88357363fc
WS

Change-Id: I5462390ca5c2f8554fcb10fa4fdd130f43f27614
MBUS-1237: Add a check to ensure that the size of the TURN acct token sent by the Server is less than or equal to 90 bytes

Change-Id: I1ba2afe9d28abf554bf137600c5d58a8f32479a3

	#daemon/posix/ICEPacketStream.h

	modified:   daemon/ice/DaemonICETransport.cc
	modified:   daemon/ice/DaemonICETransport.h
	modified:   daemon/ice/RendezvousServerInterface.cc
	modified:   daemon/ice/RendezvousServerInterface.h
	modified:   daemon/posix/ICEPacketStream.h
start count from 20K
Add a Pages controller
Finish pages
security role attributes have no default value

I added a default value to them when I converted the messaging subsystem
resources but they don't have default value (as they are not nillable)
split of cmp relationship tests
AS7-5375 CLI: unify the format of -l output between the deploy and undeploy commands
AS7-5138 Add ability to undeploy wildcarded deployment names
AS7-5414 cli help --commands doesn't list commands
AS7-5168 IllegalArgumentException when using tab-completion with a wildcard in the path
Nav and Browse: Add global categories to footer
restructured // basic layout/patterns setup
Adattato base pagamenti per metodi interni. gestione DynDNS completa
Should work for 1.8.7 now, tests passing
Remove obsolete fix for the end

The end was getting block offsets, causing client side issues.
Add the ability to make Enchanted Books. Fixes BUKKIT-3220
Add API to allow plugins to request players switch to a texture pack. Adds BUKKIT-2579

The setTexturePack method causes the player's client to
download and switch to a texture pack specified by a URL.

Note: Players can disable server textures on their client, in which
case this API would not affect them.
Implement 1.4.6 ItemMeta. Adds BUKKIT-3236, BUKKIT-3237

Some meta functionality is refactored into common methods.

CraftItemStack uses the ItemMetaKey identifiers for enchantments.

Refactored unit test to include extra functionality; initially only
checking the presence of the DelegateDeserialization annotation.
Use max inventory size for new stack. Fixes BUKKIT-3240
Add a null check for Item Entities. Fixes BUKKIT-3249
Fix command line arguments being ignored. Fixes BUKKIT-3247
Don't save server properties when it's read only. Fixes BUKKIT-3250
Fix loading Items entities with an invalid item. Addresses BUKKIT-3249
Update enchantment handling to 1.4.6. Fixes BUKKIT-3256
Check file existence before determining readOnly. Fixes BUKKIT-3255
Zero is not less than zero. Fixes BUKKIT-3259
Added TileEntitySkull for diff visibility
Implement Skull BlockState. Adds BUKKIT-3259
Implement API to get and set FireworkMeta on Firework entities
Updated version to 1.4.6-R0.1 in pom.xml for Beta.
Updated version to 1.4.6-R0.2-SNAPSHOT for development towards next release.
Add BlockJukeBox for diff visibility
One record per JukeBox.