labofsahil/github-event-dataset-2012 huggingface dataset:
Various updated paths and project references.
VERY basic scene file format and loader created, plus other mods.
Make log path happy.
Image loading and new project path directory wierdness sorted
add closing course list
Removed wrong file

Removed the compiled NPC Manager file that had a typo.
Big Refactoring
Bugfixing: FrequencyAnalyzer stop counting spaces now
Formatted output of FrequencyAnalyzer
another d2k loadscreen made by @katzsmile
suddenly it builds with current gcc ??
Merging in patch for COOK 1472
Added intermediate path rendering and canvas cursor
1) Added theory about one-pinhole CA
2) Added ability to simulate one-pinhole CA
Complete theory (TSA first iter)
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.m
CSS cleanup
Fix no payment_fee prop in mobile browser bug
Merge branch 'master' of github.com:mckoss/StreetCode
Fix filenames. wtf am I doing.
Corregidas erratas y pequeños bugs

Se han corregido ciertos bugs generados por caracteres mal posicionado y
erratas en los textos de la web.
mica corectura la double keks position
役追加分のTCHAR対応し忘れてたのを修正
Merge remote-tracking branch 'origin/tchar' into porting
ルール設定が空欄になることがあるのを直す
雀頭だけ別色でも一色手になっていたのを修正
南北戦争、惑星直列をありにすると開始できないバグを修正

向聴計算ルーチンでの subscript out of range
一部の役の判定で落ちるのを修正

琳両数
クリスマス
三色通貫
三色双龍会
七対子の時に絶一門の判定で変な添字参照してたのを修正
一部の役の判定を修正

琳両数
鏡同和
四帰一
[三四]歩高の判定が正しく行われないのに対処
役判定で使ったトレース(コメントアウト)
misc.cppの一分の役で雀頭を読むかどうかのフラグが逆になっていたのを修正
偶数本場で積み棒が付かないのを修正
雀頭を読むかどうかのフラグについての修正は勘違いだった模様

This reverts commit 05301de929e3cc7802191bbce0c5b2fef14ce77d.
幾つかの不整合を修正
初期化を忘れていたのを直す
history.txtを更新
1.7.6 ここまでのデバッグをマージ

Merge branch 'debug'
0の点を除去
フォントデータの再マージ

Merge branch 'font' into confscreen
Play games with static file path
fix openshift deployment
fix openshift deployment
Assets arranged
JSmin library added
Sending troll message to operator

Signed-off-by: Meldanor <Bhaals@gmx.de>
- fixed wrong ID for FullHealthBlock
- add a nullcheck to prevent NPE
Moving on the scene
Enriched User Management functions
jquery mobile goole maps api testing
Fix #1 - Update readme to include getting started info
Merge pull request #12 from jpennell/1-readme

Fix #1 - Update readme to include getting started info
Added sleep, so @help doesnt result excess flood
Adding functionality to the chat and much more
Fixing conflict
Added Habitation Number to HabitationEntity and it's Getter/Setter
Merge branch 'dev' of github.com:Nagian/Roomanizer into dev
Core/PhaseMgr: Renamed spell_phase_dbc table to spell_phase
[DOC] Updated description of Format / Url / SanitizeString
RST Readme
try implement data v.24
fixed 32bit build on MacOS
minor correction and update to the CMakeLists.txt for the examples
Merge pull request #26 from patnotz/master

CMakeLists.txt update for the examples/ directory
Merge branch 'master' into unstable
Avoid leaking a tempfile for the bundlefile if some error paths
astyle strikes again!
lots of changes

mainly focus on sound
oscilliscope
spectrum analyzer
bug fixess,improvements on audio sys
spaced text file for averages.
Replaces ADMIN_MEDIA_PREFIX with STATIC_URL in settings.py, as the former is deprecated in Django 1.4
Adds JS popup to the Create User window for managers
adfasfdadsf
fix 0913-1
Add log errors from sharejs.open
Empieza a diseñarse el test3
controleur db et lang
[Pictureplayer] Better support.
Refactored indexes to reuse portions of code

git-svn-id: http://orient.googlecode.com/svn/trunk@5578 3625ad7b-9c83-922f-a72b-73d79161f2ea
Fixed bug on indexes when a record was removed without specifying a key

git-svn-id: http://orient.googlecode.com/svn/trunk@5579 3625ad7b-9c83-922f-a72b-73d79161f2ea
Fixed bugs on the management of index in transaction 

git-svn-id: http://orient.googlecode.com/svn/trunk@5580 3625ad7b-9c83-922f-a72b-73d79161f2ea
Fixed issue 828

git-svn-id: http://orient.googlecode.com/svn/trunk@5581 3625ad7b-9c83-922f-a72b-73d79161f2ea
Fix by Andrey to support arrays in Object Database implementation

git-svn-id: http://orient.googlecode.com/svn/trunk@5582 3625ad7b-9c83-922f-a72b-73d79161f2ea
Updated jars

git-svn-id: http://orient.googlecode.com/svn/trunk@5583 3625ad7b-9c83-922f-a72b-73d79161f2ea
Preparing release 1.0

git-svn-id: http://orient.googlecode.com/svn/trunk@5584 3625ad7b-9c83-922f-a72b-73d79161f2ea
Removed nasty error on JVM close

git-svn-id: http://orient.googlecode.com/svn/trunk@5585 3625ad7b-9c83-922f-a72b-73d79161f2ea
Updated Copyright years to 2010-2012

git-svn-id: http://orient.googlecode.com/svn/trunk@5586 3625ad7b-9c83-922f-a72b-73d79161f2ea
Updated Copyright years to 2010-2012

git-svn-id: http://orient.googlecode.com/svn/trunk@5587 3625ad7b-9c83-922f-a72b-73d79161f2ea
Updated Copyright years to 2010-2012

git-svn-id: http://orient.googlecode.com/svn/trunk@5588 3625ad7b-9c83-922f-a72b-73d79161f2ea
Updated Copyright years to 2010-2012

git-svn-id: http://orient.googlecode.com/svn/trunk@5589 3625ad7b-9c83-922f-a72b-73d79161f2ea
Updated Copyright years to 2010-2012

git-svn-id: http://orient.googlecode.com/svn/trunk@5590 3625ad7b-9c83-922f-a72b-73d79161f2ea
Updated Copyright years to 2010-2012

git-svn-id: http://orient.googlecode.com/svn/trunk@5591 3625ad7b-9c83-922f-a72b-73d79161f2ea
Updated Copyright years to 2010-2012

git-svn-id: http://orient.googlecode.com/svn/trunk@5593 3625ad7b-9c83-922f-a72b-73d79161f2ea
Updated Copyright years to 2010-2012

git-svn-id: http://orient.googlecode.com/svn/trunk@5594 3625ad7b-9c83-922f-a72b-73d79161f2ea
Removed warnings

git-svn-id: http://orient.googlecode.com/svn/trunk@5595 3625ad7b-9c83-922f-a72b-73d79161f2ea
Changed release to 1.0.1-SNAPSHOT

git-svn-id: http://orient.googlecode.com/svn/trunk@5605 3625ad7b-9c83-922f-a72b-73d79161f2ea
Changed the refer to the new API to use in place of the deprecated one

git-svn-id: http://orient.googlecode.com/svn/trunk@5606 3625ad7b-9c83-922f-a72b-73d79161f2ea
InputStream is buffered and reset to the first position if it is not GZIPed.

git-svn-id: http://orient.googlecode.com/svn/trunk@5607 3625ad7b-9c83-922f-a72b-73d79161f2ea
Inicio real 2
Fixed to return nothing when no links
Fixed it right this time
Bug Fix
Added install cmake option
Add TNT mod
Update item_drop
General restructure of custom widgets - all in on (general widget)
no closing of tickets for users - for security
prevent display of children tickets fixed #22
fix link opening in a new tab
fixed #16
minor typo
rule link view for closing ticket
send an email to all active supporters if no supporter is responsible for the relevant category
removed test.coffee
Adding formatter class, handlebar helpers plus updated widget using central formatter
Adding template tests
Fix for date stack overflow
Merge pull request #29 from PrimeRevenue/feature/handlebars_formatters

Feature/handlebars formatters
docu about skrollr.css
Updated Japanese translation for MouseGestures

Updated Japanese translation for MouseGestures
Merge pull request #560 from sys9kdr/master

Updated Japanese translation for MouseGestures
Added option to disable search suggestions in searchbar.
- accessible from context menu (right click in searchbar)

closes #443
Function adds random location selection to dict
WIP to verify README against actual test build
support commonJS
Set fixed height so ListView is scrollable.
Add test buttons for interacting w/ game room
Move everything to the center
Switched to output format # of #
Switched keyboard to numbers
Disable and enable submit button
Fix for issue #239: building squeeze deb
port icon code for qt4.6.x
Haha, ca marche
Merge branch 'master' of https://github.com/RemiCannepin/Test
Pushing new build v 1.3
Add GUI to package
modified newFile2, created newFile2
Added model ref to rectangularlevelobject and implemented coloring of such.
updated steve.py to fix global
CMake: Fix broken jemalloc configuration.
introduced async function modifier
New android test project asserting one false test.
Updated deprecated r:rfc1123_date test to describe the correct tag.
Foutje in user edit gefixt

Tijdens de update actie waren de jobs, competenties en niveau's niet
beschikbaar.
Requirements
Project init with basic functionality

 * install into venv: python setup.py develop
 * run example_project: cd tests / python manage.py ...
 * tests: python setup.py test
Add package name to Maze & MazeGenerator
Modified quiet-mode to accept mod commands

Signed-off-by: Ravn T-M <ravn.tm@gmail.com>
Documented more stuff and fixed formatting

Signed-off-by: Aaron Willey <awilley1@gmail.com>
Fixed a few bugs

Signed-off-by: Ravn T-M <ravn.tm@gmail.com>
[t1737] added basic template files and assets folder
[t1737] added sizing controls to editorhelper.js
[t1737] Added responsive tests
[t1737] added plugin to demo sidebar
[t1736] fixed media queries for <560px
[#1727] funcional, but style less controls.
[#2422] Lint fixes. Yay.
[#2032] Make the Enter key save input changes in editors, Make Shift+Enter add Newlines in text areas
[#2259] View project source buttons. Yay.
[#2505] Fixed popup sound checkbox.
Added visibility side menu
new folder for modules
블로그 창 나타내기를 해봤다.

나머지는 다 따라하기였지만 밑에 페이지 수 만들기를 해봤는데 포문 안에 무엇을 넣어야 할까... 페이지 개수가 2개인거까지는
나타냈는데 [1],[2] 이런식으로는 나타내질 못했다.
Copydir for phpunit.xml was wrong
Deleted blockcap from LiteStats.
Add some 90lvl talent buffs to Filger.
Added buff/proc from 'Fangs of the Father' in Filger.
Fixed "minus" prefix for incoming damage value in xCT.
Added some LFD buttons skin.
Merge branch 'master' of github.com:Shestak/ShestakUI
Only list buying items when the bot has at least enough money to buy one.
Don't post any buying-adverts when EMU is 0.
SONAR-3393 Provide an AverageFormula class
Fix quality flaws
SONAR-3825 fix migration of filters
Make sure to close streams!
Add a method to get the Java version of the server SpaceRTK is running
on
Change the action aliases
Merge pull request #15 from tips48/master

Close streams
cleanupps (exec -> exc; /set/@version)
fixed vertical align with send button and amount input box.
atl: Fix problems in atlHd2ky and clarify behaviour of atlKy2hd
mole-engine 1.2.5 merged in
Improve docu - adding advanced usage
unit test module name change to comply to the testing job in Hudson
first!
ajout lol
fix typo (extraneous quote)
Survos Readme
Merge branch 'Yii' of github.com:Survos/LimeSurvey into Yii
Fixed issue #6020: Fatal error: Call to undefined method LimeExpressionManager::ngT()
Merge remote-tracking branch 'origin/Yii' into Yii
Fixed issue #5778 for Yii : Lot of correction in rtl.css for template
Dev: not do in default.css
Dev : some icon for move button in citronade
Dev : playing with languagechanger
Merge branch 'Yii' of github.com:Survos/LimeSurvey into Yii
Merge branch 'Yii' of git://github.com/LimeSurvey/LimeSurvey into Yii
remove .tmp
initial cart component.
added sencha touch debug
Updating jaxrs_advanced to match the last CXF trunk changes
set cxf.xjc.version to 2.6.0
Added css for page descriptions
add border around Images in TeamMentor_Article.xslt
add fix for double decoding issue
Merge pull request #10 from DinisCruz/master

added Fix for double-encoding issue on Article save
added toplevel makefile gfx.mk
's/using_custom_color/custom_color/g'
minor title tunings
Thomas -> UI
start stop pause buttons in home
Merge branch 'master' of https://github.com/ThomasVyncke/Scio.git
knoppen bij settings
Setting forms as services
BurtikCraft
create-article: automatically jump into the editor
Use Graphics2D.
Added HungerGames Stuff
Yay, more features
make plotting code more readable
make weights files permanent for re-usage
Added few more tests.

Added few more test cases to the list, regrouped into more simpler
sections.
More PEP8 style changes.

Changes to make the code style more PEP8 conformant.
Added a Makefile with targets for common commands.

Added a Makefile with targets to handle commonly used commands.
Key handling, trivial cleanups
Hint style: less essentials visible to user
Makefile for suse
fixed some documentations.
Correct example in KEYWORD->LOGLEVEL documentation
Merge pull request #52 from tarballs-are-good/patch-1

Correct example in KEYWORD->LOGLEVEL documentation
added Clack.Middleware.Session.Cookie.
Merge http://github.com/fukamachi/clack
welcome.html (2pages done)
VirtualMachine is arranged as newtype now in order to avoid
redundant lifting.
prijsperKILOOOOOO
prijsperKILOOOOOO
now supports "search"
Added missing docstrings.
Tidied up some imports.
useless
complict solved
Update src/main/java/com/craftfire/bifrost/enums/Scripts.java

MyBB shouldn't be here anymore...
comments
Merge branch 'master' into comments
debug template
add support for adding comments
comments kinda sorta working
comment count in template
move comment to blogpost class, add validation
JS post
add some missing files, create makefile
Merge branch 'comments'
#21: Ported the non-conrete impls for reacions and statuses
add contains? to availability model, make employees delete associated availabilities on destroy
Merge branch 'master' of https://github.com/XanderStrike/SBSG
Updated jabashit
centryfuga v2
add vs2012 projects for my personal use
move astyle options to astyle.ini and use it in runastyle and runastyle.bat
astyle.ini: use --lineend=windows since when having autocrlf=true using --lineend=linux messes up the line endings
remove useless empty lines
htmlreport/cppcheck-htmlreport: simplify css
python scripts: a few pep8 fixes
use DB access PDO
resource loader
triggeredeventaware event guard
"saveRequest" event of InputView renamed to "change"
SearchView added, search case-sensitivity fixed
debugging the mail controller
Add 'ù' and 'ç' characters into regex
Removed pathogen
Added vundle
Remove pathogen from vimrc
Added vundle Bundles
implement reusable rhythm directive with template
fixed naming of link parameter
Add gruntlint
Add grunt compass
Update coffee grunt file
Update makefile
dictionary switches
Restructured the Database Adapters for future closing of issue number
six.
TIMEOUT GLOBAL VARS IMPLEMENTED IN md30_nova with REST_forwarder
REIXS: Increases number of points used for default live correlation: larger makes better shift curves, but requires slightly more time.
Fixes bug where AMGenericScanEditor::onOneSecondTimer() was not being called to update the scan duration.
Merge branch 'master' of github.com:acquaman/acquaman into dataStoreUpgrade
decided that the segfaults are from improper architecture of python modules and dep libs
v0.94.4.78 - listen for sign breaks, if it is a leaderboard sign, remove it from the config
Added peal to list of DSLs in delitec.
Added static version of the viewer javascript.
Restore  enum devact
Various improvements
fix to use closeTag in brackets
addon for autoclosing elements like (, {, "
cleaning up
removed new file
Merge pull request #76 from deemeetar/master

Fix to use closeTag in brackets and addon for closeElement
made it so coins change their x and z when you hit them
Update README.md
Merge pull request #1 from jamuhl/patch-1

Update README.md
1) Network updates with the count of 100 and applying our own algorithm for the last month evennts
2) Verified the thumbnail issue in gift basket category.
3) Handled the gift options screen, if a particular category does not have any items, will not show them up
Fix railtie calling extend_orms
Basic style structure
Merge branch 'master' of https://github.com/aebsubis/spinspun
Solve panel appearance
Added test project, NUnit & MOQ
Move BrainThudTest to correct folder
Created an Azure WebRole
target-sh4: QOM'ify CPU

Embed CPUSH4State into SuperHCPU. Let cpu_state_reset() call
cpu_reset(). Let sh4_cpu_list() enumerate CPU classes alphabetically.

Signed-off-by: Andreas Färber <afaerber@suse.de>
target-sh4: Do not reset features on reset

Move them out of CPUSH4State so that they are not zero'ed on reset.

Signed-off-by: Andreas Färber <afaerber@suse.de>
hw/sh7750: Use SuperHCPU

In place of CPUSH4State use SuperHCPU for SH7750State::cpu field.

Fix tab indentation on those lines and add braces.

Signed-off-by: Andreas Färber <afaerber@suse.de>
target-sh4: Make cpu_sh4_invalidate_tlb() take SuperHCPU

Change argument type from CPUSH4State to SuperHCPU.
This simplifies the SH7750 SoC as its only caller.

Signed-off-by: Andreas Färber <afaerber@suse.de>
target-sh4: Make increment_urc() take SuperHCPU

Signed-off-by: Andreas Färber <afaerber@suse.de>
target-sh4: Make find_*tlb_entry() take SuperHCPU

Signed-off-by: Andreas Färber <afaerber@suse.de>
target-sh4: Make cpu_sh4_{read,write}_mmaped_{i,u}tlb_addr() take CPU

Change argument type to SuperHCPU and update the SH7750 SoC.

Signed-off-by: Andreas Färber <afaerber@suse.de>
target-sh4: Make get_{physical,mmu}_address() take SuperHCPU

Simplifies TLB helper code.

Signed-off-by: Andreas Färber <afaerber@suse.de>
target-sh4: Make copy_utlb_entry_itlb() take SuperHCPU

Signed-off-by: Andreas Färber <afaerber@suse.de>
target-sh4: Make update_itlb_use() take SuperHCPU

Signed-off-by: Andreas Färber <afaerber@suse.de>
target-sh4: Make itlb_replacement() use SuperHCPU

Signed-off-by: Andreas Färber <afaerber@suse.de>
qom: Add "realized" property to Object

The Object::realized property can only be set once and, on setting it,
invokes the ObjectClass::realize callback.

Introduce QERR_OBJECT_REALIZE_FAILED for error handling.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Cc: Anthony Liguori <anthony@codemonkey.ws>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
qom: Introduce object_realize()

Wrap setting of Object::realized property, error reporting and exit(1)
into a helper function.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Cc: Anthony Liguori <anthony@codemonkey.ws>
Cc: Paolo Bonzini <pbonzini@redhat.com>
qdev: Hook up DeviceClass::init to ObjectClass::realize

On realize, call the qdev init function.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Cc: Anthony Liguori <anthony@codemonkey.ws>
Cc: Paolo Bonzini <pbonzini@redhat.com>
hw/sh7750: QOM'ify SH7750 SoC

For now derive directly from Object. Move CPU-independent initialization
to an initfn. Add a "cpu-model" property and move CPU-dependent init
code to sh7750_realize().

Update Shix and R2D boards accordingly. Add the SoC as /sh7750 to
inspect it.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Simplify local model
fixing kit image
Updated the README file.
Added a rotations function for returning all of the rotations of a list.
#35
#47
#34
setup: link platform bashrc.
Less dogmatic about instance methods returning this.
Disk working!
Change screen's command entry key to ]

--HG--
extra : rebase_source : 0e28dfd9b4a9e2cc644feeae30b2594b955e04a9
all: Early readline work

    * Quite big modifications in the whole project
    * TODO: Fix GC it's simply not works
CMake/: Added Readline, Ncurses finders for CMakeLists.txt
main.c: Cool new readline completion for braces
main.c: Added some documentation
aklisp.h: Create empty string constants for the colors
lib.c: Added build user- and hostname information
Modified response header setting
fix #194 and fix #195. #196. closes #193
Squashed 'Begonia/BegoniaVendor/ParseKit/' content from commit 68bb0b4

git-subtree-dir: Begonia/BegoniaVendor/ParseKit
git-subtree-split: 68bb0b411cdaec7f7d5be61a460dbe2ac799d4e9
Merge commit 'd787ea86cdbb077d3cbc048512853a05167fc985' as 'Begonia/BegoniaVendor/ParseKit'
Move ParseKit
added jgo folder (js goban, useful for visual debug)

original source of jgo: http://jgoboard.com/
add beta version of new estimator
testing installer with  different curl version
add ads option and brend, parameters
Relative symlinks
Merge branch 'bash' of github.com:alexrudy/dotfiles into bash

Conflicts:
	Rakefile
fixing mate command
Moving output to pbash files
Merge branch 'bash' of github.com:alexrudy/dotfiles into bash
Adding MPPREFIX variable
Added option to skip type-checking for dependencies.
did some shit with my piss poor README
Edit ability.rb
Unit test cases for using MsgArg to represent 0-length array
HTML5-based video streaming
SCMのhttpをhttp(s)に変更
Refactor licence methods in RootController
Product page stlying
Editor: Merged Sidebar.Properties.World into Sidebar.Outline (now Sidebar.Scene).
Editor: Refactored Sidebar files.
Editor: added hotkey for toggling helpers.
Progress on generic approach (including shared install)
Update compile.pp according to the new approach
Now based on mongoid, logs and perfdata
[view/map][xs] Fix typo
script_bin: move bin structs from script.h to script_bin.h
README: add required copyright line
Fix for MOSYNC-2366 "OptionsMenu Test doesn't compile".
Merge remote-tracking branch 'origin/ThreeOneOne' into ThreeOneOne
Fix for MOSYNC-2387 "PushNotificationReceiver crashes on iOS".
Merge pull request #235 from grigaci/ThreeOneOne

Fix for MOSYNC-2366 "OptionsMenu Test doesn't compile".
[MOSYNC-2375] Android: Fixed bug that made runtime crash when rotating the device and drawing using maSetClipRect. A test program is included in the issue MOSYNC-2375.
Merge remote-tracking branch 'origin/master' into ThreeTwoClipRect
Merge pull request #243 from divineprog/master

[MOSYNC-2375] Android: Fixed bug that made runtime crash when rotating the device and drawing using maSetClipRect
Merge branch 'master' into CameraPreview
unsort option
Version bump to 0.2.0
bumped version
Regenerate gemspec for version 0.2.0
minor updates for cuda
Only two commands needed for installation now.
MDL-26275 grade: added a safety check to avoid hitting PHP's max_input_var by reducing the number of students per page if necessary
MDL-26275 grade: made the grader report retrieve the existing grades from the DB rather than sending them to the client which then returns them to the server
MDL-26257 grade: fixed the grader report JS
MDL-26275 grade: tweaked the debugging message output when maximum students per page is reduced
MDL-26275 grade: misc bug fixes to the grader report JS
dealHunter.txt is a sample output of dealHunter.sql
Configuracion de Rutas CSs y Imagenes
Configuracion de Rutas CSs y Imagenes
Change xml submodule pointer.
Added multi-word args separated by a +
Restore loading package list from local database
removed un-used/un-needed debug code that is causing issues for some on linux
Merge pull request #401 from Kronos11/develop

removed un-used/un-needed debug code that is causing issues for some on ...
Warn and proxy to apps running outside ringleader's control

For either apps that are intentionally running manually, or for apps that
ringleader lost control of somehow. Warns but proxies anyway.
Bump version to 1.0.1
Updated for aliases
Set worker log default to INFO. Dump the configuration dict to the worker log file
d3dretrace: Drop retraceModule helper
improving edit constructor
improving edit constructor
fix small syntax error
Meh. Small changes.
Remove allow_php_tags, since we're not actually using them anymore.
Hieutt 2
fixed a bug where domains admin would fail if question_2 was not answered but a surveyresponse relation does exist, added check for type array
ChangeLog
0.0.5
modificar config
Removed RestSharp DLL again
Add basic style for ordered/numbered lists.
WIP: "Making of" blog post.
fixed the precision on the pie charts, the portion of pie chart displayed, and made the needs text more readable
Updates to emacs stuff

Conflicts:
	.emacs
Rename README to README.md
ui_template: rendering opts
updated automodsumm to properly grab full first sentence in summary table
fixed Cds and Ipac in io.ascii to not mess up summary tables
Add an __array__ method to make NDData objects easy to plot.  Suggested by the mailing list thread "NDData plot proposal"
Update WCS docs to use the new layout.
Include full attribute (property) docstrings, just as we do for methods.  This is required for the WCS docs, where there are many complex-to-describe properties.
Fix typo
added more detailed attribute name in fits table deorecatuib dic to prevent conflict with columns attribute of astropy.table.Table
adjusted astropy.utils to follow (slightly altered) subpackage template
updated tools documentation to new standard
made utils and tools more consistent
made 'using xxx' sections in docs more consistent
Change order of elements on class documentation pages to be "Attributes Summary, Methods Summary, Attributes Documentation, Methods Documentation".  Fix so empty "Methods Summary" and "Methods Documentation" sections are not created.
Improve docstring on __array__ member
Merge pull request #267 from mdboom/wcs/docs-update

Update WCS docs to use the new layout.
Merge pull request #4 from eteq/docs/full-attribute-docstrings/warning-fixes

Remove 3 of 4 warnings
Merge pull request #270 from eteq/docs/homogenize-using

Homogenized "using" sections in subpackage docs
added more convinience functions in astropy.cosmology
moved cosmology convinience functions to their own file
updated cosmology tests for new convinience functions
Move __array__ documentation to the class docstring.
Added cardsLeft method

Used for determining if attackers can play more cards
Attack Legality

-addAttack has helper isLegalAttack, if true then it will make a new
battle, remove the card from attacker's hand, and print battles
-Added isFieldFull method to check if any attacks are possible before
going into attackersTurn()
-Added isRankMatch( Card ) to Battle to make legal attakc check simpler
Add the missing questionnaire.
Print the $form_body also.
Enable access to the event only for logged in users.
reduce rsync
* 0.20120929.173941, the first jsdom-free release.
* Minimal DOM implementation for HTML export
virt.kvm_vm: Skip adding interface to TAP if it's already present

This is a solution for issue #520 - when trying to create
a TAP device, the interface might be already a member of
the bridge, so the addition will fail with an IOError, with
errno == errno.EBUSY (device or resource busy). That IOError
will be wrapped in our TAPCreationError exception. So, when
performing the operation, catch the TAPCreationError and
verify errno of the detail attribute, if it's errno.EBUSY,
skip the addition operation and continue.

Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
virt: Add SLES11 SP2 to guest list

Signed-off-by: Yury Tsarev <ytsarev@suse.com>
virt: SLES 11 SP2: Add open-iscsi to package list

So it is not installed during stage 2.

Signed-off-by: Yury Tsarev <ytsarev@suse.com>
Adding abaaso version of TodoMVC

Removing submodules & providing minified modules

Inlining template

Updating comment

Restructured directories to follow app specs

Upgrading abaaso to 2.8.14 because the pull request is still open

Changing link

Setting route on "all", so "error" isn't executed

Setting the active route anchor after route.init(), uncoupling count() from the DOM

Updating a docblock

Removing unneeded routes, bumping abaaso to 2.8.15 for a routing fix

Upgrading abaaso to 2.8.16

Noticed data.find() is looking for a string, when it's really a boolean (works due to regex test; but it's misdirection)

Fixing double click behaviour

Upgrading abaaso to 2.9.2, removing deprecated datalist module

Updating @link

Minor tweak

Upgrading abaaso to 3.0.1

Upgraded abaaso to 3.1.0

Upgrading abaaso to 3.2.11

Upgrading abaaso to 3.1.19

Upgrading abaaso to 3.3.0

Fixing abaaso version

Upgrading to 3.3.9
single ticks prevent modifyvm command from working at least in windows and consistent with other calls
Add contributors section to README.
Merge pull request #270 from joshmarcus/wip_update_readme

Add contributors section to README.
forgot one rename
Ignore updatedAt when responding to an update request.
Fixed bugs with search/backspace
Fixed bug with checking changed state of method
Fixed bug with selected method highlighting
Added DaRIS to Desktop.
baserCMSのセッション設定が読み込まれていない問題を改善し、セッションまわりの設定を見なおした。 fixes #3233

● 初期設定
・ブラウザを閉じた後の有効期限：７日
・放置した場合の有効期限：１日１回、100分の１の確率でセッションが切れる
Forgot to export those extra functions.
Show / hide wrappers should make unmap_notify work
added checks when updating/inserting raidplan
reverting some movements. common css/js should be placed in a common directory

Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
Adds request for making API calls easier
[Elloyd2] Updated to make project run local IIS
Bug 8754 - Adding capture of Error Estimate and Polygon for GEOLocate

git-svn-id: https://specify.svn.sourceforge.net/svnroot/specify/trunk/Specify@10299 ce9bf4bf-376f-1848-a496-a1c9fe3b1a39
Bug 8754 - rename data member

git-svn-id: https://specify.svn.sourceforge.net/svnroot/specify/trunk/Specify@10300 ce9bf4bf-376f-1848-a496-a1c9fe3b1a39
point to CoffeeScript.org for installation instructions
support look around via u_sees function, remove debugging from draw system
updated package.json
fixed markup fail
fixed package.json JSON formatting error
added ignore file
created a changelog file
changed 'Sampling' message
Clone: remove fragile path-handling code.

Also standardized on 3-space indentation. Sorry
about that.
Checkout: read blob objects to file.

Properly handling file modes. Still needs line-
ending transformations.
Clone: update index to HEAD.

git_clone now produces a repo that 
`git status` reports as clean!
rebuild binaries.
Fixed g++ compile errors. Added Debian binary.
Changed links href to " " because of angular a.js deactivator (https://github.com/angular/angular.js/blob/master/src/ng/directive/a.js)
getMiniCart will ignore other actions and Ajax
[util/simple-hint] don't close hint dialog when a modifier key is pressed

Closes #853
Mention JSHint in line widgets demo link

Closes #843
Ensure block-indent doesn't use outdated state

Closes #844
Fix setOption('tabindex', ...)
Update lib/util/searchcursor.js

fix reverse Regexp match which cause memory leak
[demo/mustache] Recognize triple braces
Don't do overwrite when pasting
embedded ruby configuration
[javascript&clike modes] Indent block comments with CodeMirror.Pass

This'll align them with the previous line. It's not a perfect solution,
but probably better than simply returning 0.

Issue #854
Add gittip donation link
[javascript mode] Fix suble parsing bug in for loop specs
Ensure line widgets have a higher z-index than the selection

Closes #855
Make .CodeMirror-selected style less specific

To make it easier for themes to override it.

Fixes ambiance
Update submodules before installing stuff

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Correct unhandled alert + Deamon cleanup
Merge reactevents into devel
fixed

Signed-off-by: Christopher Van Oort <cvocvo@gmail.com>
More fixes for behaviors. Now fixing the timers
Adding comments and cleaning old code
Remove localized files
添加文件夹

mini,source,temp,test,view
PGUSER,PWD export
to hide ^M chars
Adding new discover() method from #269
Removing checkbox next to non assignable categories
Adding new contentRenderer attributes
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
Changed how files were included to better support client-side templates
Fixed some bugs in the runtime
Push to 0.10.3
big fix on counts of answers

Signed-off-by: Brad Miller <bonelake@gmail.com>
Merge branch 'master' into courselib
* Added net-snmp.


git-svn-id: https://nixos.org/repos/nix/nixpkgs/trunk@34413 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
usr_command
usr_command
usr_command
usr_command
usr_command
usr_command
usr_command
usr_command
usr_command
usr_command
usr_command
usr_command
usr_command
usr_command
usr_command
usr_command
usr_command
Menu working!
Added remaining two hydralic pump outputs.
Fix chrome issues. Won't be the same again :(
Using const for chat sessions

Allocating memory for keys and values
Add optional server parameter to /connect command
Adding fertilizer reminders
WorkItem: 4699 Standalone Iteration Bug - Move story under/above other story in Product Story tree.
made code more consistent
top-aligned .gifs
Prevent tests from bleeding into other tests.
Fixed some typos and whitespace.

New plugin structure

New plugin structure
Fixed merge conflict
+high-level APIs,
+comparison to HTA,
allow https requests to be disabled,
clean up i18n,
+getDefautPrivs() public API for introspection
i18n-ize options HTML dialog file as entire file (to allow for complete localization control)
+namespaced-simple-storage, some JSLint
Tooltips (since default not working inside addon)
Add chrome demos to main branch
Fix package.json default array
Fix custom namespaced-simple-storage API
Listen to options changes made through Firefox's own dialog
Add updated XPI
Start on a more MVC-style design
Mostly fleshed out
remove system pom for jsqlparser because it doesnt work
add phpunit.xml.dist for complete test run
bump version for 0.2.19b4 release
Don't use unless.
added mkview auto commands
plain pizza satisfied + cheat star
lint para não dar warning em handlers.
diversas imagens adicionadas.
classe para gerenciar EventOverlays.
mudei layout do balloon de adicionar eventos.
texto explicativo para o progressbar na 'action bar'.
strings adicionadas.
Manager para EventsOverlay na classe App.
EventType.ADD adicionado.
variaveis em AddEventsBalloon ligadas ao layout.
onclick adicionada ao AddEventBalloon
Ajustei o código para utilizar o Manager recém criado.
system not syetem ;)
Removing git-status call from is_git_repo; this was causing issues with a cold fs cache
[Form] Fixed: FormTypeInterface::getParent() supports returning FormTypeInterface instances again
[OptionParser] Fixed bridge tests
Renamed component OptionParser to OptionsParser
Removed videos from repo.
Merge pull request #183 from btubbs/master

Updating docs with recent config changes to PROCESS_STATE
add events for adding/removing process groups
When searching, the outline view is now automatically expanding all items.
hdl - ADC interface
linux - ADC driver
Fixed bug in display
Merge branch 'master' into bryan
trying to fix sqlite gem bundle error
增加光环条颜色过滤组.

Signed-off-by: cadcamzy <cadcamzy@hotmail.com>
[#2950] Editors close when track event is deselected. Also, editors open when selected, and not just when clicked. Example, tab changes the active editor/closes it now too.
[#1912] Ensure the first run init function runs only once
renamed animation image files, added essential information
reoder the enviroment panel
Merge pull request #64 from dogmatic69/reorder-env-panel

reoder the enviroment panel
Re-taxtify on updating form after save
Show a simulation of the edit box with a selection, when the reference picker is opened
openssh-server added to fresh_install
first commit
removed a couple of aliases that are now handled more effectively in
bash scripts
this has been replaced by ~/.scripts/fresh_install.sh
moved to ~/.rsync
moving to a new git repo in ~/.scripts directory
moving these to a repo in ~/.scripts
removed old stuff that is no longer used
better use of fill_array and length array with unit conversion
Update libs and urls for Persona
Add a Makefile to simplyfy typing rsync.
Load provisioning_api based on document.referrer

Thanks to mook in #identity
Update to new jwcrypto api
More sensorsInc changes
debug: correct error if only one ids asked
Merge branch 'develop' of forge.capensis.org:canopsis into develop
add: root inmodel
change: window more pretty
doRedraw after create view
reset device AP conflict state when topology merges
Merge remote branch 'floodlight/master'
Changes Static Flow Pusher to return a status when using it's REST API.
DeviceManager: don't log a debug message on every packet_in, use trace level
Merge into master from pull request #80:
Changes Static Flow Pusher to return a status when using it's REST API. (https://github.com/floodlight/floodlight/pull/80)
Fix Javadoc comments
Merge into master from pull request #81:
Fix Javadoc comments (https://github.com/floodlight/floodlight/pull/81)
Inital commit of Web UI.
Initialize modules listed in the config file first then dependencies.
Merge into master from pull request #82:
Initialize modules listed in the config file first then dependencies. (https://github.com/floodlight/floodlight/pull/82)
Topology graphing is starting to work.
Display loaded module list in a nicer way.
Fixing bug which allowed multiple modules that provide service X to be loaded
1 - Static Flow Pusher - On OFActionOutput set max length to be Short.MAX_VALUE
2 - Log PacketIns with no payload and stop processing
3 - Remove unused IOFController interface
Fix unit tests for Static Flow Pusher.
Merge into master from pull request #85:
Modifications to Static Flow Pusher. (https://github.com/floodlight/floodlight/pull/85)
Fix Javadoc of Forwarding#doFlood()
Merge pull request #83 from nilok/disallow-multiple-providers

Fixing bug which allowed multiple modules that provide a given service to be loaded.
Merge into master from pull request #86:
Fix Javadoc of Forwarding#doFlood() (https://github.com/floodlight/floodlight/pull/86)
clean up blocking algorithm for all APs when topo changes
Added NevadoBytesMessage
Fixed NevadoMapMessage to better handle char and byte[] in generic object getter/setter
Added javax.jms:jms:1.1 repo
Fixed NevadoStreamMessage
Fixed NevadoBytesMessage
Fixed JMSExpirationTest
Add MCQs for Mergesort Implementation module
Radix sort more questions added
Radix sort more questions addded.

Conflicts:
	Exercises/Sorting/RadixSortMCQ1.html
Adding 2 forbidden structures.

Forbidding 2 sulfur compounds that were causing errors in QMTP
during thiophene model construction.
fix roulette test
special bloom filter for editor
fixed clearTempPersistentBOM func
23g23gf
Fixed a bug in user/update.

user/update was crashing when a first name, last name, organization, and personal ID were all not given and one didn't already exist.
Sicherheits Commit

-Generische Datenhaltung
Sicherheitsspeicherung 2
Merge branch 'master' of github.com:ch3ck3r/Lecturate

Conflicts:
	public_html/setup.php
	resources/generic/Constraint.class.php
	resources/generic/ForeignKey.class.php
	resources/generic/Int.class.php
	resources/generic/Model.class.php
	resources/generic/Sql.class.php
	resources/generic/Unique.class.php
	resources/generic/Varchar.class.php
added 66% width
multiple assignment, ARRAY_DUMP opcode
Fixing gemfile error
Finished the login and change password pages
模块加载器的DOC文档的文案调整
Changed language item
first branch merge
Merge branches 'b1' and 'master'
Diagrama de clases actualizado (integrar nuevamente)
fix audio crashes
removed mailto
Amr class: add back support for suppressing warnings
updated home

rewrote home to display current users loans and IOUs
rewrote javascript for quiz
Make model export script compatible with Blender 2.63
comit 75 files
Nuevo metodo para obtener un valor entero maximo
not sure why squisher was removed, put it back

Change-Id: Ie20420e14f53383512c12613e0f76f6b89455854
add guest user login
updated stylies for index
keep delete_if specific comment to itself
working with virtualenv
Update notes for submitted changes

* Colorize 'bosh diff' output
fix #31 and #406

Conflicts:

	lib/less/parser.js
Add whitespace tests for previous commit - newline in selectors
Silverlight controls working with emit events.
fix packaging etc.
basic set-up for reading file
cosmetics
question 3 was correct, the other two need work
Year working now
messages in utf8
fixed server crash
fixed #1240: Updated vs2008 project setting (release target).
Merge pull request #937 from dumganhar/gles20

fixed #1240: Updated vs2008 project setting (release target).
issue #1310: Added one resource (TestPremultipliedAlpha.plist).
Merge pull request #1014 from dumganhar/gles20

issue #1310: Added one resource (TestPremultipliedAlpha.plist).
change TARGET_OS_IPHONE to TARGET_OS_MAC in TestCpp mac project
Merge pull request #1201 from minggo/gles20

change TARGET_OS_IPHONE to TARGET_OS_MAC in TestCpp mac project
added dyndns options to dhcpd.conf
fixed long sms with user data headers
Adding Requests library
dns keys, zone things
added IE opacity rules to cover all versions
Removed filter of "dist" directory
Changed rev version to latest.integration + set changing to true for
tangara modules (in order to ensure that latest build are taken into
account)
remove empty vim-align directory
update tos text
Add field listing to Kinds xml output - closes #191
Create README.md

proposed README.md (based on website)
[zsh] Load gen-pass plugin
Added UI and code for mirror selection
fix package names to be in JJs List
Fix the actual names
Merge branch 'dev' of https://github.com/cosmicdreams/OWC3 into dev
remove the features directory for good`q
Merge branch 'wjaspers' into dev
Adds a "Resource" content type.
Test seeing that I know how to use github. Also added vector.h
MB-100 Fix ocassional test failure

The child process sometimes finishes too fast, before
we get a chance to monitor it. In that case the monitor's
message has a reason 'noproc'.

Change-Id: I9e802c441505ce572ffa12aee2417329ab42eb60
Reviewed-on: http://review.couchbase.org/16690
Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
Tested-by: Filipe David Borba Manana <fdmanana@gmail.com>
Add more tests

Change-Id: Ib75f7db3de38a6861e249c6aafa026beb5c5195a
Reviewed-on: http://review.couchbase.org/15971
Reviewed-by: Chiyoung Seo <chiyoung.seo@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>
stop condition when a predefined number of points is reached
on site modifications
return after each sent message
Maximum number of points with MAXPOINTS
128 bins fro histograms
Added GETCAM and SETCAM
renamed SharedResult
Added a mix and anagply screens
removed makefile.in
Merge branch 'master' into cuda4compat

Conflicts:
	src/HomographyAnalyzerGPU.cpp
	src/MainWindow.cpp
	src/Makefile.am
	src/NetworkServer.h
	src/main.cpp
Add a border-radius to notes
Added proper `traits` support

Important: It only works if the projects runs in PHP 5-4.
[avahi] fixing domain name in avahi ads
[signalling] add bridge mac address in hello message
fixing init script to clean up more efficiently the route and ip addresses
puts ctrl + a mapping back into tmux config
Player: Use the fixed Quaternion.fromEuler.
Tests: Add a test project.
OKAY HIEUNGO BRANCH VERSION 8:30pm Friday March 23 2012.
Originator response comment
Merge pull request #311 from cspurk/master

merged jsteffen’s pull request
change the URL to match the one in the used local_settings.py file
Added history + hierarchy for files
Still needed:
History and testing
More site support
added support for rails_admin and CanCan
Issued Postits 1.6.0 STABLE

- renamed module from postits into cwsoft-postits
- finished updating repository structure
Added import of Media Items to CSV migration script. Updated DB Dump Scripts and alldata fixture with new media data.
Updated template to pull media for amazon link, added rudimentary pass at amazon link to detail page. Added url debugging view.
Checked in south migration for adding identifier to media table.
tweaked schema migration.
tweaked schema migration.
Merge remote-tracking branch 'origin/master'

Conflicts:
	podiobooks/core/migrations/0002_auto__del_field_media_baseurl__add_field_media_identifier__add_field_m.py
	podiobooks/core/models.py
tweaked schema migration.
Merge remote-tracking branch 'origin/master'

Conflicts:
	podiobooks/core/migrations/0002_auto__del_field_media_baseurl__add_field_media_identifier__add_field_m.py
	podiobooks/core/models.py
tweaked schema migration.
Merge remote-tracking branch 'origin/master'

Conflicts:
	podiobooks/core/migrations/0002_auto__del_field_media_baseurl__add_field_media_identifier__add_field_m.py
	podiobooks/core/models.py
pylint cleanup.
pylint cleanup.
Merge remote-tracking branch 'origin/master'
Adding redis to stating requirements.
Adding hiredis to stating requirements.
Added amazon chiclet.
Subscription box formatting cleanup.
Moved dataload scripts out of project.
Title list style formatting.
Added fixture for award data.
renamed files to webnotify from notify
disquis comments
javadoc
TimepointのtoStringメソッドを拡充
Icu4j*DurationFormatterを抽象化したDetailedDurationFormatterを作成。
Updated homepage
Now tracking changes for releases
Adding version number to class
Explicit requires of files
Version 0.5.4
Dynamic Gemspec

* Pulls in changelog for current version to be displayed when install finishes
Merge branch 'changelog'
Copy-paste derp
Simple siever
Fixed configuration file
Fixed mail template
refactored mailer defaults
Put client identifiers in Room data, and use a compact client representation
mv sh cron
Cleaning up room.py, changing how reverse directions are mapped
mobs won't leave their respective areas
Adding experience/leveling, and alignment
Factory class can now create room objects
Basic grid-based dungeons
removing some code duplication
Fixing a few bugs in the grid logic
Change Quizer to Quizzer, Add Schools Model, Controller, View
Ignoring swap files.
Started writing simple Gibbs sampler for finite GMM.
Updated the main catalog with better abstraction through the
use of table objects instead of arrays with other redundant
data.

Explicitly started to deprecate some unneeded calls
Build V2.12.07.1301
Build V2.12.07.1601
Build V2.12.07.1701
Build V2.12.07.1701
Merge remote-tracking branch 'remotes/origin/development'
add Modz, goalz
- Changed parameter types for methods in DBAdapter
- Added method calls to DBAdapter from AsteroidInfo
fixed fetchProfileAttributes. modified view profile.
changes to logger.
security fix. added encoding for data.
use scrollfactor
bugfix to EditBooleanField - checkbox label wasn't set correctly

Also, set the cc-fieldEditor property on the outer div for
EditDateTimeField, so it gets spaced properly.
XMLConversion: working on support for reading IProblemAndTestCaseData

Not quite there, but it's close.
Update TODO list.
Modularize spiders-nest pattern code.
Update demo.
clean up and documentation as well as a a case change in Site controller
merged changes and resolved conflict in Orders controller
finished wrap
Latest logs at the bottom in webpage console

Closes #26
Allows for platform specific assists.

Images, etc, that are found in Resources/iphone, Resources/android.

Also has better thereby avoiding introducing errors in files that have regex code, e.g. /"/ or /'/ (e.g. underscore.js).
  
Closes #27
npm version bump
Updates to support long-polling
better paas including node.acs
Merge branch 'master' of https://github.com/dbarbul/guestbook

Conflicts:
	Dmitriy Barbul Notes.txt
Merge branch 'master' of https://github.com/dbarbul/guestbook
Add one function to read byte string.
Refactor out image functions.
Remove broken Gaussian.
added rvmrc and gems file, cleaned up rakefile and tasks
layout changed a bit.
Added missing spec for overrides

Added some specs to ensure that the override works and does not
influence not overridden attributes
commin before pulling
Merge branch 'master' of github.com:delfrrr/ventum-js
move souces from maplos-client to ventum-js
fixed wrong comparation result in SLOPE_ORDER
Score menu, Score storing, Score in playstate
Using Google CDN for jQuery to ensure support for https
Force node version 0.8.x
Working groups
Slideup on default and server
alt+a to jump to last active buffer
Syncing movement with weechat
Modal box for links (iframe for now)
wops
esc+number and alt+number. Navigation in arrays
Click on name
focus on input when chaning buffer
Need a conditional for esc+i
esc+n
Not perfect iframe, but works...
Focus on input (when inserting nick)
update count in select-list (for devices)
noes
Merge remote-tracking branch 'upstream/master'
added a new function to pull out an array of the length fields from a mafBlock_t*
small bug fixes
Changed GUI to pygame.
Externalized requirements
Merge pull request #6 from poligarcia/master

Externalized requirements !
changing httpraw to default to 200.
adding timestamps to error logs.
fixing ViewNotFoundError view.
adding file view as readfile passthrough.
deadlock code (unfinished), validating moves after they are done and re-requesting moves if they are invalid
added probability table comment to clarify evaluation strategy
added link to GoPkgDoc hosted documentation
updated webmock, hopefully fix cucumber
Merge pull request #3266 from diaspora/new-webmock

updated webmock, hopefully fix cucumber
Revert "Merge pull request #3655 from denschub/feature/fix-followhq-setting"

This reverts commit b0fc95764d2864aab68805620f1a0f48f9f1d4fd, reversing
changes made to 0057e9ed46d1fe8e7417a499465053231c40a734.
top level email is a noun, not a verb [ci skip]
Fix issue #3348 Log In button is off the right side of the screen
Merge pull request #3507 from movilla/fix_LogIn_default_web

Fix issue #3348 Log In button is off the right side of the screen [ci skip]